зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1601660 - Part 2: Remove getContentBlockingLog from nsIDocShell.idl r=Ehsan
This patch removes the unnecessary getContentBlockingLog function from nsIDocShell.idl. Differential Revision: https://phabricator.services.mozilla.com/D57444 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
91e877c5cd
Коммит
da3402759d
|
@ -3353,28 +3353,6 @@ nsDocShell::GetMessageManager(ContentFrameMessageManager** aMessageManager) {
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsDocShell::GetContentBlockingLog(Promise** aPromise) {
|
|
||||||
NS_ENSURE_ARG_POINTER(aPromise);
|
|
||||||
|
|
||||||
Document* doc = mContentViewer->GetDocument();
|
|
||||||
ErrorResult rv;
|
|
||||||
RefPtr<Promise> promise = Promise::Create(doc->GetOwnerGlobal(), rv);
|
|
||||||
if (NS_WARN_IF(rv.Failed())) {
|
|
||||||
return rv.StealNSResult();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mContentViewer) {
|
|
||||||
promise->MaybeResolve(
|
|
||||||
NS_ConvertUTF8toUTF16(doc->GetContentBlockingLog()->Stringify()));
|
|
||||||
} else {
|
|
||||||
promise->MaybeRejectWithUndefined();
|
|
||||||
}
|
|
||||||
|
|
||||||
promise.forget(aPromise);
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsDocShell::GetIsNavigating(bool* aOut) {
|
nsDocShell::GetIsNavigating(bool* aOut) {
|
||||||
*aOut = mIsNavigating;
|
*aOut = mIsNavigating;
|
||||||
|
|
|
@ -1097,17 +1097,6 @@ interface nsIDocShell : nsIDocShellTreeItem
|
||||||
*/
|
*/
|
||||||
[infallible] readonly attribute ContentFrameMessageManager messageManager;
|
[infallible] readonly attribute ContentFrameMessageManager messageManager;
|
||||||
|
|
||||||
/**
|
|
||||||
* Asynchronously retrieve a JSON string representing a log of the
|
|
||||||
* content blocking events happened so far in the current tab from the
|
|
||||||
* content process.
|
|
||||||
*
|
|
||||||
* This returns a Promise which resolves to a string on success, and is
|
|
||||||
* rejected on failure. For documentation on the string format, please
|
|
||||||
* see nsISecureBrowserUI.contentBlockingLogJSON.
|
|
||||||
*/
|
|
||||||
Promise getContentBlockingLog();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This returns a Promise which resolves to a boolean. True when the
|
* This returns a Promise which resolves to a boolean. True when the
|
||||||
* document has Tracking Content that has been blocked from loading, false
|
* document has Tracking Content that has been blocked from loading, false
|
||||||
|
|
|
@ -1120,11 +1120,6 @@ class Document : public nsINode,
|
||||||
MOZ_MUST_USE RefPtr<GetContentBlockingEventsPromise>
|
MOZ_MUST_USE RefPtr<GetContentBlockingEventsPromise>
|
||||||
GetContentBlockingEvents();
|
GetContentBlockingEvents();
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the content blocking log.
|
|
||||||
*/
|
|
||||||
ContentBlockingLog* GetContentBlockingLog() { return &mContentBlockingLog; }
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get tracking content blocked flag for this document.
|
* Get tracking content blocked flag for this document.
|
||||||
*/
|
*/
|
||||||
|
|
Загрузка…
Ссылка в новой задаче