diff options
Diffstat (limited to 'dom/ipc')
| -rw-r--r-- | dom/ipc/PTabContext.ipdlh | 5 | ||||
| -rw-r--r-- | dom/ipc/TabChild.cpp | 5 | ||||
| -rw-r--r-- | dom/ipc/TabContext.cpp | 16 | ||||
| -rw-r--r-- | dom/ipc/TabContext.h | 20 |
4 files changed, 5 insertions, 41 deletions
diff --git a/dom/ipc/PTabContext.ipdlh b/dom/ipc/PTabContext.ipdlh index 72cd90e2a..62d6ec0f3 100644 --- a/dom/ipc/PTabContext.ipdlh +++ b/dom/ipc/PTabContext.ipdlh @@ -48,11 +48,6 @@ struct FrameIPCTabContext // Whether this TabContext should work in prerender mode. bool isPrerendered; - // The requested presentation URL. - // This value would be empty if the TabContext isn't created for - // presented content. - nsString presentationURL; - // Keyboard indicator state inherited from the parent. UIStateChangeType showAccelerators; UIStateChangeType showFocusRings; diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 182aa628b..caae91fa5 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -770,11 +770,6 @@ TabChild::NotifyTabContextUpdated(bool aIsPreallocated) if (aIsPreallocated) { nsDocShell::Cast(docShell)->SetOriginAttributes(OriginAttributesRef()); } - - // Set SANDBOXED_AUXILIARY_NAVIGATION flag if this is a receiver page. - if (!PresentationURL().IsEmpty()) { - docShell->SetSandboxFlags(SANDBOXED_AUXILIARY_NAVIGATION); - } } void diff --git a/dom/ipc/TabContext.cpp b/dom/ipc/TabContext.cpp index 66a279052..b313da0ff 100644 --- a/dom/ipc/TabContext.cpp +++ b/dom/ipc/TabContext.cpp @@ -190,12 +190,6 @@ TabContext::OriginAttributesRef() const return mOriginAttributes; } -const nsAString& -TabContext::PresentationURL() const -{ - return mPresentationURL; -} - UIStateChangeType TabContext::ShowAccelerators() const { @@ -215,8 +209,7 @@ TabContext::SetTabContext(bool aIsMozBrowserElement, mozIApplication* aAppFrameOwnerApp, UIStateChangeType aShowAccelerators, UIStateChangeType aShowFocusRings, - const DocShellOriginAttributes& aOriginAttributes, - const nsAString& aPresentationURL) + const DocShellOriginAttributes& aOriginAttributes) { NS_ENSURE_FALSE(mInitialized, false); @@ -248,7 +241,6 @@ TabContext::SetTabContext(bool aIsMozBrowserElement, mContainingAppId = containingAppId; mOwnApp = aOwnApp; mContainingApp = aAppFrameOwnerApp; - mPresentationURL = aPresentationURL; mShowAccelerators = aShowAccelerators; mShowFocusRings = aShowFocusRings; return true; @@ -261,7 +253,6 @@ TabContext::AsIPCTabContext() const mContainingAppId, mIsMozBrowserElement, mIsPrerendered, - mPresentationURL, mShowAccelerators, mShowFocusRings)); } @@ -285,7 +276,6 @@ MaybeInvalidTabContext::MaybeInvalidTabContext(const IPCTabContext& aParams) bool isPrerendered = false; uint32_t containingAppId = NO_APP_ID; DocShellOriginAttributes originAttributes; - nsAutoString presentationURL; UIStateChangeType showAccelerators = UIStateChangeType_NoChange; UIStateChangeType showFocusRings = UIStateChangeType_NoChange; @@ -348,7 +338,6 @@ MaybeInvalidTabContext::MaybeInvalidTabContext(const IPCTabContext& aParams) isMozBrowserElement = ipcContext.isMozBrowserElement(); isPrerendered = ipcContext.isPrerendered(); containingAppId = ipcContext.frameOwnerAppId(); - presentationURL = ipcContext.presentationURL(); showAccelerators = ipcContext.showAccelerators(); showFocusRings = ipcContext.showFocusRings(); originAttributes = ipcContext.originAttributes(); @@ -395,8 +384,7 @@ MaybeInvalidTabContext::MaybeInvalidTabContext(const IPCTabContext& aParams) containingApp, showAccelerators, showFocusRings, - originAttributes, - presentationURL); + originAttributes); if (!rv) { mInvalidReason = "Couldn't initialize TabContext."; } diff --git a/dom/ipc/TabContext.h b/dom/ipc/TabContext.h index 1507a0dc8..e0b6f0d96 100644 --- a/dom/ipc/TabContext.h +++ b/dom/ipc/TabContext.h @@ -125,12 +125,6 @@ public: */ const DocShellOriginAttributes& OriginAttributesRef() const; - /** - * Returns the presentation URL associated with the tab if this tab is - * created for presented content - */ - const nsAString& PresentationURL() const; - UIStateChangeType ShowAccelerators() const; UIStateChangeType ShowFocusRings() const; @@ -169,8 +163,7 @@ protected: mozIApplication* aAppFrameOwnerApp, UIStateChangeType aShowAccelerators, UIStateChangeType aShowFocusRings, - const DocShellOriginAttributes& aOriginAttributes, - const nsAString& aPresentationURL); + const DocShellOriginAttributes& aOriginAttributes); /** * Modify this TabContext to match the given TabContext. This is a special @@ -226,11 +219,6 @@ private: DocShellOriginAttributes mOriginAttributes; /** - * The requested presentation URL. - */ - nsString mPresentationURL; - - /** * Keyboard indicator state (focus rings, accelerators). */ UIStateChangeType mShowAccelerators; @@ -257,8 +245,7 @@ public: mozIApplication* aAppFrameOwnerApp, UIStateChangeType aShowAccelerators, UIStateChangeType aShowFocusRings, - const DocShellOriginAttributes& aOriginAttributes, - const nsAString& aPresentationURL = EmptyString()) + const DocShellOriginAttributes& aOriginAttributes) { return TabContext::SetTabContext(aIsMozBrowserElement, aIsPrerendered, @@ -266,8 +253,7 @@ public: aAppFrameOwnerApp, aShowAccelerators, aShowFocusRings, - aOriginAttributes, - aPresentationURL); + aOriginAttributes); } }; |