зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1363659 - Ensure not sending cookie service constructor when shutting down, r=ehsan
This commit is contained in:
Родитель
6f1e15db21
Коммит
78f744d40d
|
@ -6,6 +6,7 @@
|
||||||
#include "mozilla/net/CookieServiceChild.h"
|
#include "mozilla/net/CookieServiceChild.h"
|
||||||
#include "mozilla/LoadInfo.h"
|
#include "mozilla/LoadInfo.h"
|
||||||
#include "mozilla/BasePrincipal.h"
|
#include "mozilla/BasePrincipal.h"
|
||||||
|
#include "mozilla/dom/ContentChild.h"
|
||||||
#include "mozilla/ipc/URIUtils.h"
|
#include "mozilla/ipc/URIUtils.h"
|
||||||
#include "mozilla/net/NeckoChild.h"
|
#include "mozilla/net/NeckoChild.h"
|
||||||
#include "nsIChannel.h"
|
#include "nsIChannel.h"
|
||||||
|
@ -47,6 +48,12 @@ CookieServiceChild::CookieServiceChild()
|
||||||
{
|
{
|
||||||
NS_ASSERTION(IsNeckoChild(), "not a child process");
|
NS_ASSERTION(IsNeckoChild(), "not a child process");
|
||||||
|
|
||||||
|
mozilla::dom::ContentChild* cc =
|
||||||
|
static_cast<mozilla::dom::ContentChild*>(gNeckoChild->Manager());
|
||||||
|
if (cc->IsShuttingDown()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// This corresponds to Release() in DeallocPCookieService.
|
// This corresponds to Release() in DeallocPCookieService.
|
||||||
NS_ADDREF_THIS();
|
NS_ADDREF_THIS();
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче