diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-01-29 14:55:20 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-01-29 14:55:20 +0000 |
| commit | 745254183c226e5db0caa566ad496d2f0192182e (patch) | |
| tree | 467b282ce4e90dba6837dd9d631b6c9082463274 /dom/ipc/TabContext.cpp | |
| parent | c76214f0b54cf74b69d0fb4afa0d2eca2e898a98 (diff) | |
| parent | e1daeef18312a0cb17eda6bed7f363d8748ed4a3 (diff) | |
| download | UXP-745254183c226e5db0caa566ad496d2f0192182e.tar UXP-745254183c226e5db0caa566ad496d2f0192182e.tar.gz UXP-745254183c226e5db0caa566ad496d2f0192182e.tar.lz UXP-745254183c226e5db0caa566ad496d2f0192182e.tar.xz UXP-745254183c226e5db0caa566ad496d2f0192182e.zip | |
Merge branch 'master' into release
Diffstat (limited to 'dom/ipc/TabContext.cpp')
| -rw-r--r-- | dom/ipc/TabContext.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
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."; } |