wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 3732b1dad003 (bug 1221049) for bustage

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2015-11-04 11:52:05 +01:00
parent d55ced9451
commit 9f4b4c5bc8
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docshell/base/LoadContext.h
View File

@ -77,7 +77,7 @@ public:
bool aIsContent,
bool aUsePrivateBrowsing,
bool aUseRemoteTabs,
const OriginAttributes& aAttrs)
OriginAttributes& aAttrs)
: mTopFrameElement(do_GetWeakReference(aTopFrameElement))
, mNestedFrameId(0)
, mIsContent(aIsContent)

3
dom/ipc/ContentParent.cpp
View File

@ -5188,7 +5188,8 @@ ContentParent::AllocPOfflineCacheUpdateParent(const URIParams& aManifestURI,
}
RefPtr<mozilla::docshell::OfflineCacheUpdateParent> update =
new mozilla::docshell::OfflineCacheUpdateParent(
tabContext.OriginAttributesRef());
tabContext.OwnOrContainingAppId(),
tabContext.IsBrowserElement());
// Use this reference as the IPDL reference.
return update.forget().take();
}

4
dom/ipc/TabParent.cpp
View File

@ -2822,11 +2822,13 @@ TabParent::GetLoadContext()
if (mLoadContext) {
loadContext = mLoadContext;
} else {
// TODO Bug 1191740 - Add OriginAttributes in TabContext
OriginAttributes attrs = OriginAttributes(OwnOrContainingAppId(), IsBrowserElement());
loadContext = new LoadContext(GetOwnerElement(),
true /* aIsContent */,
mChromeFlags & nsIWebBrowserChrome::CHROME_PRIVATE_WINDOW,
mChromeFlags & nsIWebBrowserChrome::CHROME_REMOTE_WINDOW,
OriginAttributesRef());
attrs);
mLoadContext = loadContext;
}
return loadContext.forget();

6
uriloader/prefetch/OfflineCacheUpdateParent.cpp
View File

@ -52,9 +52,11 @@ NS_IMPL_ISUPPORTS(OfflineCacheUpdateParent,
// OfflineCacheUpdateParent <public>
//-----------------------------------------------------------------------------
OfflineCacheUpdateParent::OfflineCacheUpdateParent(const OriginAttributes& aAttrs)
// TODO: Bug 1191740 - Add OriginAttributes in TabContext
OfflineCacheUpdateParent::OfflineCacheUpdateParent(uint32_t aAppId,
bool aIsInBrowser)
: mIPCClosed(false)
, mOriginAttributes(aAttrs)
, mOriginAttributes(aAppId, aIsInBrowser)
{
// Make sure the service has been initialized
nsOfflineCacheUpdateService::EnsureService();

2
uriloader/prefetch/OfflineCacheUpdateParent.h
View File

@ -45,7 +45,7 @@ public:
mIPCClosed = true;
}
OfflineCacheUpdateParent(const mozilla::OriginAttributes& aAttrs);
OfflineCacheUpdateParent(uint32_t aAppId, bool aIsInBrowser);
virtual void ActorDestroy(ActorDestroyReason aWhy) override;
private: