wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changesets c6691cff88a4 and 43a7db7bf902 (bug 1044598) for bustage.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2014-07-28 11:08:12 -04:00
parent b7648f8eb6
commit 7d109c3b7f
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/media/MediaRecorder.cpp
View File

@ -454,8 +454,7 @@ private:
// shutdown notification and stop Read Thread.
nsContentUtils::RegisterShutdownObserver(this);
nsRefPtr<Session> thisSession(this);
nsRefPtr<nsIRunnable> event = new ExtractRunnable(thisSession.forget());
nsRefPtr<nsIRunnable> event = new ExtractRunnable(this);
if (NS_FAILED(mReadThread->Dispatch(event, NS_DISPATCH_NORMAL))) {
NS_WARNING("Failed to dispatch ExtractRunnable at beginning");
}
@ -473,8 +472,7 @@ private:
MOZ_ASSERT(false, "NS_DispatchToMainThread PushBlobRunnable failed");
}
// Destroy this session object in main thread.
nsRefPtr<Session> thisSession(this);
if (NS_FAILED(NS_DispatchToMainThread(new DestroyRunnable(thisSession.forget())))) {
if (NS_FAILED(NS_DispatchToMainThread(new DestroyRunnable(this)))) {
MOZ_ASSERT(false, "NS_DispatchToMainThread DestroyRunnable failed");
}
}

6
dom/workers/ServiceWorkerManager.cpp
View File

@ -1213,12 +1213,12 @@ ServiceWorkerManager::GetServiceWorkerRegistration(nsIURI* aURI)
return nullptr;
}
nsRefPtr<ServiceWorkerRegistration> registration;
domainInfo->mServiceWorkerRegistrations.Get(scope, getter_AddRefs(registration));
ServiceWorkerRegistration* registration;
domainInfo->mServiceWorkerRegistrations.Get(scope, &registration);
// ordered scopes and registrations better be in sync.
MOZ_ASSERT(registration);
return registration.forget();
return registration;
}
namespace {