зеркало из https://github.com/mozilla/gecko-dev.git
Bug 575348 - e10s: Fennectrolysis crashes in cycle collection after geolocation test. r=dougt
--HG-- extra : rebase_source : eb456a0f15ee2ac98d8b10d8cdd5a3af8ad6790c
This commit is contained in:
Родитель
1a778be865
Коммит
c71a1f8f2f
|
@ -1098,6 +1098,7 @@ nsGeolocationRequestProxy::Cancel()
|
|||
{
|
||||
NS_ASSERTION(mParent, "No parent for request");
|
||||
unused << mozilla::dom::GeolocationRequestParent::Send__delete__(mParent, false);
|
||||
mParent = nsnull;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -1106,6 +1107,7 @@ nsGeolocationRequestProxy::Allow()
|
|||
{
|
||||
NS_ASSERTION(mParent, "No parent for request");
|
||||
unused << mozilla::dom::GeolocationRequestParent::Send__delete__(mParent, true);
|
||||
mParent = nsnull;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -1118,13 +1120,11 @@ GeolocationRequestParent::GeolocationRequestParent(nsIDOMElement *element, const
|
|||
|
||||
mURI = uri;
|
||||
mElement = element;
|
||||
mProxy = nsnull;
|
||||
}
|
||||
|
||||
GeolocationRequestParent::~GeolocationRequestParent()
|
||||
{
|
||||
MOZ_COUNT_DTOR(GeolocationRequestParent);
|
||||
delete mProxy;
|
||||
}
|
||||
|
||||
bool
|
||||
|
|
|
@ -60,13 +60,13 @@ class GeolocationRequestParent : public PGeolocationRequestParent
|
|||
|
||||
nsCOMPtr<nsIURI> mURI;
|
||||
nsCOMPtr<nsIDOMElement> mElement;
|
||||
nsGeolocationRequestProxy *mProxy;
|
||||
nsCOMPtr<nsGeolocationRequestProxy> mProxy;
|
||||
|
||||
private:
|
||||
virtual bool Recvprompt();
|
||||
};
|
||||
|
||||
} // namespace dom
|
||||
} // namespace dom
|
||||
} // namespace mozilla
|
||||
|
||||
class nsGeolocationRequestProxy : public nsIGeolocationRequest
|
||||
|
|
Загрузка…
Ссылка в новой задаче