Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 02:57:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1191740 - Factor out nsFrameLoader::GetNewTabContext. r=bholley

Browse Source
This commit is contained in:
Kan-Ru Chen 2015-10-08 14:44:36 +08:00
parent c184280166
commit 8fe3285641
2 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
dom/base/nsFrameLoader.cpp
View File

@ -284,26 +284,8 @@ nsFrameLoader::SwitchProcessAndLoadURI(nsIURI* aURI)
nsRefPtr<TabParent> tp = nullptr;
MutableTabContext context;
nsCOMPtr<mozIApplication> ownApp = GetOwnApp();
nsCOMPtr<mozIApplication> containingApp = GetContainingApp();
OriginAttributes attrs = OriginAttributes();
attrs.mInBrowser = OwnerIsBrowserFrame();
// Get the AppId from ownApp
uint32_t appId = nsIScriptSecurityManager::NO_APP_ID;
if (ownApp) {
nsresult rv = ownApp->GetLocalId(&appId);
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_STATE(appId != nsIScriptSecurityManager::NO_APP_ID);
} else if (containingApp) {
nsresult rv = containingApp->GetLocalId(&appId);
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_STATE(appId != nsIScriptSecurityManager::NO_APP_ID);
}
attrs.mAppId = appId;
bool tabContextUpdated = context.SetTabContext(ownApp, containingApp, attrs);
NS_ENSURE_STATE(tabContextUpdated);
nsresult rv = GetNewTabContext(&context);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<Element> ownerElement = mOwnerContent;
tp = ContentParent::CreateBrowserOrApp(context, ownerElement, nullptr);
@ -312,7 +294,7 @@ nsFrameLoader::SwitchProcessAndLoadURI(nsIURI* aURI)
}
mRemoteBrowserShown = false;
nsresult rv = SwapRemoteBrowser(tp);
rv = SwapRemoteBrowser(tp);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
@ -2277,27 +2259,8 @@ nsFrameLoader::TryRemoteBrowser()
js::ProfileEntry::Category::OTHER);
MutableTabContext context;
nsCOMPtr<mozIApplication> ownApp = GetOwnApp();
nsCOMPtr<mozIApplication> containingApp = GetContainingApp();
OriginAttributes attrs = OriginAttributes();
attrs.mInBrowser = OwnerIsBrowserFrame();
// Get the AppId from ownApp
uint32_t appId = nsIScriptSecurityManager::NO_APP_ID;
if (ownApp) {
nsresult rv = ownApp->GetLocalId(&appId);
NS_ENSURE_SUCCESS(rv, false);
NS_ENSURE_TRUE(appId != nsIScriptSecurityManager::NO_APP_ID, false);
} else if (containingApp) {
nsresult rv = containingApp->GetLocalId(&appId);
NS_ENSURE_SUCCESS(rv, false);
NS_ENSURE_TRUE(appId != nsIScriptSecurityManager::NO_APP_ID, false);
}
attrs.mAppId = appId;
bool rv = true;
rv = context.SetTabContext(ownApp, containingApp, attrs);
NS_ENSURE_TRUE(rv, false);
nsresult rv = GetNewTabContext(&context);
NS_ENSURE_SUCCESS(rv, false);
nsCOMPtr<Element> ownerElement = mOwnerContent;
mRemoteBrowser = ContentParent::CreateBrowserOrApp(context, ownerElement, openerContentParent);
@ -3061,3 +3024,30 @@ nsFrameLoader::MaybeUpdatePrimaryTabParent(TabParentChange aChange)
}
}
}
nsresult
nsFrameLoader::GetNewTabContext(MutableTabContext* aTabContext)
{
nsCOMPtr<mozIApplication> ownApp = GetOwnApp();
nsCOMPtr<mozIApplication> containingApp = GetContainingApp();
OriginAttributes attrs = OriginAttributes();
attrs.mInBrowser = OwnerIsBrowserFrame();
// Get the AppId from ownApp
uint32_t appId = nsIScriptSecurityManager::NO_APP_ID;
if (ownApp) {
nsresult rv = ownApp->GetLocalId(&appId);
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_STATE(appId != nsIScriptSecurityManager::NO_APP_ID);
} else if (containingApp) {
nsresult rv = containingApp->GetLocalId(&appId);
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_STATE(appId != nsIScriptSecurityManager::NO_APP_ID);
}
attrs.mAppId = appId;
bool tabContextUpdated = aTabContext->SetTabContext(ownApp, containingApp, attrs);
NS_ENSURE_STATE(tabContextUpdated);
return NS_OK;
}

3
dom/base/nsFrameLoader.h
View File

@ -42,6 +42,7 @@ namespace dom {
class ContentParent;
class PBrowserParent;
class TabParent;
class MutableTabContext;
} // namespace dom
namespace ipc {
@ -317,6 +318,8 @@ private:
void InitializeBrowserAPI();
nsresult GetNewTabContext(mozilla::dom::MutableTabContext* aTabContext);
enum TabParentChange {
eTabParentRemoved,
eTabParentChanged