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

Bug 1425316 P6 Remove ServiceWorkerManager::ShouldReportToWindow(). r=asuth

Browse Source
This commit is contained in:
Ben Kelly 2017-12-19 10:04:49 -05:00
parent 16e6c399d6
commit 81cb582d32
2 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
dom/workers/ServiceWorkerManager.cpp
View File

@ -3632,63 +3632,6 @@ ServiceWorkerManager::RemoveListener(nsIServiceWorkerManagerListener* aListener)
return NS_OK;
}
nsresult
ServiceWorkerManager::ShouldReportToWindow(mozIDOMWindowProxy* aWindow,
const nsACString& aScope,
bool* aResult)
{
AssertIsOnMainThread();
MOZ_ASSERT(aResult);
*aResult = false;
// Get the inner window ID to compare to our document windows below.
nsCOMPtr<nsPIDOMWindowOuter> targetWin = nsPIDOMWindowOuter::From(aWindow);
if (NS_WARN_IF(!targetWin)) {
return NS_OK;
}
targetWin = targetWin->GetScriptableTop();
uint64_t winId = targetWin->WindowID();
// Examine any windows performing a navigation that we are currently
// intercepting.
InterceptionList* intList = mNavigationInterceptions.Get(aScope);
if (intList) {
for (uint32_t i = 0; i < intList->Length(); ++i) {
nsCOMPtr<nsIInterceptedChannel> channel = intList->ElementAt(i);
nsCOMPtr<nsIChannel> inner;
nsresult rv = channel->GetChannel(getter_AddRefs(inner));
if (NS_WARN_IF(NS_FAILED(rv))) {
continue;
}
uint64_t id = nsContentUtils::GetInnerWindowID(inner);
if (id == 0) {
continue;
}
nsCOMPtr<nsPIDOMWindowInner> win =
nsGlobalWindowInner::GetInnerWindowWithId(id)->AsInner();
if (!win) {
continue;
}
nsCOMPtr<nsPIDOMWindowOuter> outer = win->GetScriptableTop();
// Match. We should report to this window.
if (outer && winId == outer->WindowID()) {
*aResult = true;
return NS_OK;
}
}
}
// No match. We should not report to this window.
return NS_OK;
}
NS_IMETHODIMP
ServiceWorkerManager::Observe(nsISupports* aSubject,
const char* aTopic,

4
dom/workers/ServiceWorkerManager.h
View File

@ -324,10 +324,6 @@ public:
void
CheckPendingReadyPromises();
nsresult
ShouldReportToWindow(mozIDOMWindowProxy* aWindow, const nsACString& aScope,
bool* aResult);
private:
ServiceWorkerManager();
~ServiceWorkerManager();