mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 895123 - Change nsFrameLoader::mChildHost from nsCOMPtr<nsIObserver> to nsRefPtr<ContentParent>, and rename it to mContentParent.
This doesn't change any behavior; the only effect of this change is to make it easier to figure out, from GDB, which ContentParent a nsFrameLoader points to.
This commit is contained in:
parent
e27322bb60
commit
f55bb48aa5
@ -294,6 +294,15 @@ nsFrameLoader::nsFrameLoader(Element* aOwner, bool aNetworkCreated)
|
||||
ResetPermissionManagerStatus();
|
||||
}
|
||||
|
||||
nsFrameLoader::~nsFrameLoader()
|
||||
{
|
||||
mNeedsAsyncDestroy = true;
|
||||
if (mMessageManager) {
|
||||
mMessageManager->Disconnect();
|
||||
}
|
||||
nsFrameLoader::Destroy();
|
||||
}
|
||||
|
||||
nsFrameLoader*
|
||||
nsFrameLoader::Create(Element* aOwner, bool aNetworkCreated)
|
||||
{
|
||||
@ -2067,7 +2076,7 @@ nsFrameLoader::TryRemoteBrowser()
|
||||
rootChromeWin->GetBrowserDOMWindow(getter_AddRefs(browserDOMWin));
|
||||
mRemoteBrowser->SetBrowserDOMWindow(browserDOMWin);
|
||||
|
||||
mChildHost = mRemoteBrowser->Manager();
|
||||
mContentParent = mRemoteBrowser->Manager();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
@ -37,6 +37,7 @@ class mozIApplication;
|
||||
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
class ContentParent;
|
||||
class PBrowserParent;
|
||||
class TabParent;
|
||||
struct StructuredCloneData;
|
||||
@ -154,13 +155,7 @@ protected:
|
||||
nsFrameLoader(mozilla::dom::Element* aOwner, bool aNetworkCreated);
|
||||
|
||||
public:
|
||||
~nsFrameLoader() {
|
||||
mNeedsAsyncDestroy = true;
|
||||
if (mMessageManager) {
|
||||
mMessageManager->Disconnect();
|
||||
}
|
||||
nsFrameLoader::Destroy();
|
||||
}
|
||||
~nsFrameLoader();
|
||||
|
||||
bool AsyncScrollEnabled() const
|
||||
{
|
||||
@ -435,8 +430,9 @@ private:
|
||||
// doesn't necessarily correlate with docshell/document visibility.
|
||||
bool mVisible : 1;
|
||||
|
||||
// XXX leaking
|
||||
nsCOMPtr<nsIObserver> mChildHost;
|
||||
// The ContentParent associated with mRemoteBrowser. This was added as a
|
||||
// strong ref in bug 545237, and we're not sure if we can get rid of it.
|
||||
nsRefPtr<mozilla::dom::ContentParent> mContentParent;
|
||||
RenderFrameParent* mCurrentRemoteFrame;
|
||||
TabParent* mRemoteBrowser;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user