зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 2762cab83d31 (bug 937317) WinXP Build Bustage on a CLOSED TREE
This commit is contained in:
Родитель
2f0f6d99a7
Коммит
5791a07e96
|
@ -2492,7 +2492,6 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TabChildGlobal)
|
|||
NS_INTERFACE_MAP_ENTRY(nsISyncMessageSender)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIContentFrameMessageManager)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIScriptObjectPrincipal)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIGlobalObject)
|
||||
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ContentFrameMessageManager)
|
||||
NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)
|
||||
|
||||
|
@ -2557,20 +2556,10 @@ TabChildGlobal::GetJSContextForEventHandlers()
|
|||
return nsContentUtils::GetSafeJSContext();
|
||||
}
|
||||
|
||||
nsIPrincipal*
|
||||
nsIPrincipal*
|
||||
TabChildGlobal::GetPrincipal()
|
||||
{
|
||||
if (!mTabChild)
|
||||
return nullptr;
|
||||
return mTabChild->GetPrincipal();
|
||||
}
|
||||
|
||||
JSObject*
|
||||
TabChildGlobal::GetGlobalJSObject()
|
||||
{
|
||||
NS_ENSURE_TRUE(mTabChild, nullptr);
|
||||
nsCOMPtr<nsIXPConnectJSObjectHolder> ref = mTabChild->GetGlobal();
|
||||
NS_ENSURE_TRUE(ref, nullptr);
|
||||
return ref->GetJSObject();
|
||||
}
|
||||
|
||||
|
|
|
@ -51,8 +51,7 @@ class ClonedMessageData;
|
|||
|
||||
class TabChildGlobal : public nsDOMEventTargetHelper,
|
||||
public nsIContentFrameMessageManager,
|
||||
public nsIScriptObjectPrincipal,
|
||||
public nsIGlobalObject
|
||||
public nsIScriptObjectPrincipal
|
||||
{
|
||||
public:
|
||||
TabChildGlobal(TabChild* aTabChild);
|
||||
|
@ -128,7 +127,6 @@ public:
|
|||
|
||||
virtual JSContext* GetJSContextForEventHandlers() MOZ_OVERRIDE;
|
||||
virtual nsIPrincipal* GetPrincipal() MOZ_OVERRIDE;
|
||||
virtual JSObject* GetGlobalJSObject() MOZ_OVERRIDE;
|
||||
|
||||
nsCOMPtr<nsIContentFrameMessageManager> mMessageManager;
|
||||
TabChild* mTabChild;
|
||||
|
|
Загрузка…
Ссылка в новой задаче