Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1305580 part 2. Change nsXMLDocument::Load telemetry to separately count chrome and content callers. r=smaug

Browse Source
This commit is contained in:
Boris Zbarsky 2016-09-28 15:46:46 -04:00
parent 6a6430cf38
commit 1bb443447d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/base/nsDeprecatedOperationList.h
View File

@ -33,6 +33,7 @@ DEPRECATED_OPERATION(MozGetAsFile)
DEPRECATED_OPERATION(UseOfCaptureEvents)
DEPRECATED_OPERATION(UseOfReleaseEvents)
DEPRECATED_OPERATION(UseOfDOM3LoadMethod)
DEPRECATED_OPERATION(ChromeUseOfDOM3LoadMethod)
DEPRECATED_OPERATION(ShowModalDialog)
DEPRECATED_OPERATION(Window_Content)
DEPRECATED_OPERATION(SyncXMLHttpRequest)

8
dom/xml/XMLDocument.cpp
View File

@ -277,8 +277,6 @@ XMLDocument::Load(const nsAString& aUrl, ErrorResult& aRv)
return false;
}
WarnOnceAbout(nsIDocument::eUseOfDOM3LoadMethod);
nsCOMPtr<nsIDocument> callingDoc = GetEntryDocument();
nsCOMPtr<nsIPrincipal> principal = NodePrincipal();
@ -293,6 +291,12 @@ XMLDocument::Load(const nsAString& aUrl, ErrorResult& aRv)
return false;
}
if (nsContentUtils::IsCallerChrome()) {
WarnOnceAbout(nsIDocument::eChromeUseOfDOM3LoadMethod);
} else {
WarnOnceAbout(nsIDocument::eUseOfDOM3LoadMethod);
}
nsIURI *baseURI = mDocumentURI;
nsAutoCString charset;