|
|
@@ -0,0 +1,1404 @@
|
|
|
+# HG changeset patch
|
|
|
+# User Samael Wang <freesamael@gmail.com>
|
|
|
+# Date 1513379383 21600
|
|
|
+# Node ID 33cb29987d2093b92a84dac9fb9bb9907811a3a8
|
|
|
+# Parent e247144f1933cf5aed9b9d858e1f45ec3325f072
|
|
|
+Bug 1406161 - Part 2: Reorder docshell members and remove unnecessary `virtual` or `NS_IMETHOD` keywords. r=smaug
|
|
|
+
|
|
|
+MozReview-Commit-ID: KuEchFzFu7E
|
|
|
+
|
|
|
+diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
|
|
|
+--- a/docshell/base/nsDocShell.cpp
|
|
|
++++ b/docshell/base/nsDocShell.cpp
|
|
|
+@@ -742,33 +742,46 @@ DecreasePrivateDocShellCount()
|
|
|
+ if (obsvc) {
|
|
|
+ obsvc->NotifyObservers(nullptr, "last-pb-context-exited", nullptr);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ nsDocShell::nsDocShell()
|
|
|
+ : nsDocLoader()
|
|
|
++ , mForcedCharset(nullptr)
|
|
|
++ , mParentCharset(nullptr)
|
|
|
++ , mTreeOwner(nullptr)
|
|
|
+ , mDefaultScrollbarPref(Scrollbar_Auto, Scrollbar_Auto)
|
|
|
+- , mReferrerPolicy(0)
|
|
|
+- , mFailedLoadType(0)
|
|
|
+- , mTreeOwner(nullptr)
|
|
|
+ , mCharsetReloadState(eCharsetReloadInit)
|
|
|
+- , mChildOffset(0)
|
|
|
+- , mBusyFlags(BUSY_FLAGS_NONE)
|
|
|
+- , mAppType(nsIDocShell::APP_TYPE_UNKNOWN)
|
|
|
+- , mLoadType(0)
|
|
|
++ , mOrientationLock(eScreenOrientation_None)
|
|
|
++ , mParentCharsetSource(0)
|
|
|
+ , mMarginWidth(-1)
|
|
|
+ , mMarginHeight(-1)
|
|
|
+ , mItemType(typeContent)
|
|
|
+ , mPreviousTransIndex(-1)
|
|
|
+ , mLoadedTransIndex(-1)
|
|
|
++ , mChildOffset(0)
|
|
|
+ , mSandboxFlags(0)
|
|
|
+- , mOrientationLock(eScreenOrientation_None)
|
|
|
++ , mBusyFlags(BUSY_FLAGS_NONE)
|
|
|
++ , mAppType(nsIDocShell::APP_TYPE_UNKNOWN)
|
|
|
++ , mLoadType(0)
|
|
|
++ , mDefaultLoadFlags(nsIRequest::LOAD_NORMAL)
|
|
|
++ , mReferrerPolicy(0)
|
|
|
++ , mFailedLoadType(0)
|
|
|
++ , mFrameType(FRAME_TYPE_REGULAR)
|
|
|
++ , mPrivateBrowsingId(0)
|
|
|
++ , mDisplayMode(nsIDocShell::DISPLAY_MODE_BROWSER)
|
|
|
++ , mJSRunToCompletionDepth(0)
|
|
|
++ , mTouchEventsOverride(nsIDocShell::TOUCHEVENTS_OVERRIDE_NONE)
|
|
|
+ , mFullscreenAllowed(CHECK_ATTRIBUTES)
|
|
|
++ , mCreatingDocument(false)
|
|
|
++#ifdef DEBUG
|
|
|
++ , mInEnsureScriptEnv(false)
|
|
|
++#endif
|
|
|
+ , mCreated(false)
|
|
|
+ , mAllowSubframes(true)
|
|
|
+ , mAllowPlugins(true)
|
|
|
+ , mAllowJavascript(true)
|
|
|
+ , mAllowMetaRedirects(true)
|
|
|
+ , mAllowImages(true)
|
|
|
+ , mAllowMedia(true)
|
|
|
+ , mAllowDNSPrefetch(true)
|
|
|
+@@ -798,29 +811,16 @@ nsDocShell::nsDocShell()
|
|
|
+ , mIsExecutingOnLoadHandler(false)
|
|
|
+ , mIsPrintingOrPP(false)
|
|
|
+ , mSavingOldViewer(false)
|
|
|
+ , mDynamicallyCreated(false)
|
|
|
+ , mAffectPrivateSessionLifetime(true)
|
|
|
+ , mInvisible(false)
|
|
|
+ , mHasLoadedNonBlankURI(false)
|
|
|
+ , mBlankTiming(false)
|
|
|
+- , mCreatingDocument(false)
|
|
|
+-#ifdef DEBUG
|
|
|
+- , mInEnsureScriptEnv(false)
|
|
|
+-#endif
|
|
|
+- , mDefaultLoadFlags(nsIRequest::LOAD_NORMAL)
|
|
|
+- , mFrameType(FRAME_TYPE_REGULAR)
|
|
|
+- , mPrivateBrowsingId(0)
|
|
|
+- , mDisplayMode(nsIDocShell::DISPLAY_MODE_BROWSER)
|
|
|
+- , mForcedCharset(nullptr)
|
|
|
+- , mParentCharset(nullptr)
|
|
|
+- , mParentCharsetSource(0)
|
|
|
+- , mJSRunToCompletionDepth(0)
|
|
|
+- , mTouchEventsOverride(nsIDocShell::TOUCHEVENTS_OVERRIDE_NONE)
|
|
|
+ {
|
|
|
+ AssertOriginAttributesMatchPrivateBrowsing();
|
|
|
+
|
|
|
+ nsContentUtils::GenerateUUIDInPlace(mHistoryID);
|
|
|
+
|
|
|
+ if (gDocShellCount++ == 0) {
|
|
|
+ NS_ASSERTION(sURIFixup == nullptr,
|
|
|
+ "Huh, sURIFixup not null in first nsDocShell ctor!");
|
|
|
+@@ -5444,17 +5444,17 @@ nsDocShell::DisplayLoadError(nsresult aE
|
|
|
+ prompter->Alert(nullptr, messageStr.get());
|
|
|
+ }
|
|
|
+
|
|
|
+ return NS_OK;
|
|
|
+ }
|
|
|
+
|
|
|
+ #define PREF_SAFEBROWSING_ALLOWOVERRIDE "browser.safebrowsing.allowOverride"
|
|
|
+
|
|
|
+-NS_IMETHODIMP
|
|
|
++nsresult
|
|
|
+ nsDocShell::LoadErrorPage(nsIURI* aURI, const char16_t* aURL,
|
|
|
+ const char* aErrorPage,
|
|
|
+ const char* aErrorType,
|
|
|
+ const char16_t* aDescription,
|
|
|
+ const char* aCSSClass,
|
|
|
+ nsIChannel* aFailedChannel)
|
|
|
+ {
|
|
|
+ #if defined(DEBUG)
|
|
|
+@@ -13609,17 +13609,17 @@ nsDocShell::ConfirmRepost(bool* aRepost)
|
|
|
+ if (NS_FAILED(rv)) {
|
|
|
+ return rv;
|
|
|
+ }
|
|
|
+
|
|
|
+ *aRepost = (buttonPressed == 0);
|
|
|
+ return NS_OK;
|
|
|
+ }
|
|
|
+
|
|
|
+-NS_IMETHODIMP
|
|
|
++nsresult
|
|
|
+ nsDocShell::GetPromptAndStringBundle(nsIPrompt** aPrompt,
|
|
|
+ nsIStringBundle** aStringBundle)
|
|
|
+ {
|
|
|
+ NS_ENSURE_SUCCESS(GetInterface(NS_GET_IID(nsIPrompt), (void**)aPrompt),
|
|
|
+ NS_ERROR_FAILURE);
|
|
|
+
|
|
|
+ nsCOMPtr<nsIStringBundleService> stringBundleService =
|
|
|
+ mozilla::services::GetStringBundleService();
|
|
|
+@@ -13664,17 +13664,17 @@ nsIScrollableFrame*
|
|
|
+ nsDocShell::GetRootScrollFrame()
|
|
|
+ {
|
|
|
+ nsCOMPtr<nsIPresShell> shell = GetPresShell();
|
|
|
+ NS_ENSURE_TRUE(shell, nullptr);
|
|
|
+
|
|
|
+ return shell->GetRootScrollFrameAsScrollable();
|
|
|
+ }
|
|
|
+
|
|
|
+-NS_IMETHODIMP
|
|
|
++nsresult
|
|
|
+ nsDocShell::EnsureScriptEnvironment()
|
|
|
+ {
|
|
|
+ if (mScriptGlobal) {
|
|
|
+ return NS_OK;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (mIsBeingDestroyed) {
|
|
|
+ return NS_ERROR_NOT_AVAILABLE;
|
|
|
+@@ -13703,17 +13703,17 @@ nsDocShell::EnsureScriptEnvironment()
|
|
|
+ MOZ_ASSERT(mScriptGlobal);
|
|
|
+
|
|
|
+ mScriptGlobal->SetDocShell(this);
|
|
|
+
|
|
|
+ // Ensure the script object is set up to run script.
|
|
|
+ return mScriptGlobal->EnsureScriptEnvironment();
|
|
|
+ }
|
|
|
+
|
|
|
+-NS_IMETHODIMP
|
|
|
++nsresult
|
|
|
+ nsDocShell::EnsureEditorData()
|
|
|
+ {
|
|
|
+ bool openDocHasDetachedEditor = mOSHE && mOSHE->HasDetachedEditor();
|
|
|
+ if (!mEditorData && !mIsBeingDestroyed && !openDocHasDetachedEditor) {
|
|
|
+ // We shouldn't recreate the editor data if it already exists, or
|
|
|
+ // we're shutting down, or we already have a detached editor data
|
|
|
+ // stored in the session history. We should only have one editordata
|
|
|
+ // per docshell.
|
|
|
+@@ -13728,17 +13728,17 @@ nsDocShell::EnsureTransferableHookData()
|
|
|
+ {
|
|
|
+ if (!mTransferableHookData) {
|
|
|
+ mTransferableHookData = new nsTransferableHookData();
|
|
|
+ }
|
|
|
+
|
|
|
+ return NS_OK;
|
|
|
+ }
|
|
|
+
|
|
|
+-NS_IMETHODIMP
|
|
|
++nsresult
|
|
|
+ nsDocShell::EnsureFind()
|
|
|
+ {
|
|
|
+ nsresult rv;
|
|
|
+ if (!mFind) {
|
|
|
+ mFind = do_CreateInstance("@mozilla.org/embedcomp/find;1", &rv);
|
|
|
+ if (NS_FAILED(rv)) {
|
|
|
+ return rv;
|
|
|
+ }
|
|
|
+diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
|
|
|
+--- a/docshell/base/nsDocShell.h
|
|
|
++++ b/docshell/base/nsDocShell.h
|
|
|
+@@ -131,17 +131,17 @@ public:
|
|
|
+
|
|
|
+ RefPtr<nsDocShell> mDocShell;
|
|
|
+ nsCOMPtr<nsIURI> mURI;
|
|
|
+ nsCOMPtr<nsIPrincipal> mPrincipal;
|
|
|
+ int32_t mDelay;
|
|
|
+ bool mRepeat;
|
|
|
+ bool mMetaRefresh;
|
|
|
+
|
|
|
+-protected:
|
|
|
++private:
|
|
|
+ virtual ~nsRefreshTimer();
|
|
|
+ };
|
|
|
+
|
|
|
+ enum eCharsetReloadState
|
|
|
+ {
|
|
|
+ eCharsetReloadInit,
|
|
|
+ eCharsetReloadRequested,
|
|
|
+ eCharsetReloadStopOrigional
|
|
|
+@@ -164,30 +164,48 @@ class nsDocShell final
|
|
|
+ , public nsIWebShellServices
|
|
|
+ , public nsILinkHandler
|
|
|
+ , public nsIClipboardCommands
|
|
|
+ , public nsIDOMStorageManager
|
|
|
+ , public nsINetworkInterceptController
|
|
|
+ , public nsIDeprecationWarner
|
|
|
+ , public mozilla::SupportsWeakPtr<nsDocShell>
|
|
|
+ {
|
|
|
+- friend class nsDSURIContentListener;
|
|
|
+- friend class FramingChecker;
|
|
|
+- using Encoding = mozilla::Encoding;
|
|
|
++public:
|
|
|
++ // Event type dispatched by RestorePresentation
|
|
|
++ class RestorePresentationEvent : public mozilla::Runnable
|
|
|
++ {
|
|
|
++ public:
|
|
|
++ NS_DECL_NSIRUNNABLE
|
|
|
++ explicit RestorePresentationEvent(nsDocShell* aDs)
|
|
|
++ : mozilla::Runnable("nsDocShell::RestorePresentationEvent")
|
|
|
++ , mDocShell(aDs)
|
|
|
++ {
|
|
|
++ }
|
|
|
++ void Revoke() { mDocShell = nullptr; }
|
|
|
++ private:
|
|
|
++ RefPtr<nsDocShell> mDocShell;
|
|
|
++ };
|
|
|
+
|
|
|
+-public:
|
|
|
++ class InterfaceRequestorProxy : public nsIInterfaceRequestor
|
|
|
++ {
|
|
|
++ public:
|
|
|
++ explicit InterfaceRequestorProxy(nsIInterfaceRequestor* aRequestor);
|
|
|
++ NS_DECL_THREADSAFE_ISUPPORTS
|
|
|
++ NS_DECL_NSIINTERFACEREQUESTOR
|
|
|
++
|
|
|
++ private:
|
|
|
++ virtual ~InterfaceRequestorProxy();
|
|
|
++ InterfaceRequestorProxy() {}
|
|
|
++ nsWeakPtr mWeakPtr;
|
|
|
++ };
|
|
|
++
|
|
|
+ MOZ_DECLARE_WEAKREFERENCE_TYPENAME(nsDocShell)
|
|
|
+-
|
|
|
+- nsDocShell();
|
|
|
+-
|
|
|
+- virtual nsresult Init() override;
|
|
|
+-
|
|
|
+ NS_DECL_ISUPPORTS_INHERITED
|
|
|
+ NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDocShell, nsDocLoader)
|
|
|
+-
|
|
|
+ NS_DECL_NSIDOCSHELL
|
|
|
+ NS_DECL_NSIDOCSHELLTREEITEM
|
|
|
+ NS_DECL_NSIWEBNAVIGATION
|
|
|
+ NS_DECL_NSIBASEWINDOW
|
|
|
+ NS_DECL_NSISCROLLABLE
|
|
|
+ NS_DECL_NSITEXTSCROLL
|
|
|
+ NS_DECL_NSIDOCCHARSET
|
|
|
+ NS_DECL_NSIINTERFACEREQUESTOR
|
|
|
+@@ -195,29 +213,33 @@ public:
|
|
|
+ NS_DECL_NSIREFRESHURI
|
|
|
+ NS_DECL_NSICONTENTVIEWERCONTAINER
|
|
|
+ NS_DECL_NSIWEBPAGEDESCRIPTOR
|
|
|
+ NS_DECL_NSIAUTHPROMPTPROVIDER
|
|
|
+ NS_DECL_NSICLIPBOARDCOMMANDS
|
|
|
+ NS_DECL_NSIWEBSHELLSERVICES
|
|
|
+ NS_DECL_NSINETWORKINTERCEPTCONTROLLER
|
|
|
+ NS_DECL_NSIDEPRECATIONWARNER
|
|
|
++
|
|
|
+ NS_FORWARD_SAFE_NSIDOMSTORAGEMANAGER(TopSessionStorageManager())
|
|
|
+
|
|
|
++ // Need to implement (and forward) nsISecurityEventSink, because
|
|
|
++ // nsIWebProgressListener has methods with identical names...
|
|
|
++ NS_FORWARD_NSISECURITYEVENTSINK(nsDocLoader::)
|
|
|
++
|
|
|
++ nsDocShell();
|
|
|
++ virtual nsresult Init() override;
|
|
|
++
|
|
|
+ NS_IMETHOD Stop() override
|
|
|
+ {
|
|
|
+ // Need this here because otherwise nsIWebNavigation::Stop
|
|
|
+ // overrides the docloader's Stop()
|
|
|
+ return nsDocLoader::Stop();
|
|
|
+ }
|
|
|
+
|
|
|
+- // Need to implement (and forward) nsISecurityEventSink, because
|
|
|
+- // nsIWebProgressListener has methods with identical names...
|
|
|
+- NS_FORWARD_NSISECURITYEVENTSINK(nsDocLoader::)
|
|
|
+-
|
|
|
+ // nsILinkHandler
|
|
|
+ NS_IMETHOD OnLinkClick(nsIContent* aContent,
|
|
|
+ nsIURI* aURI,
|
|
|
+ const char16_t* aTargetSpec,
|
|
|
+ const nsAString& aFileName,
|
|
|
+ nsIInputStream* aPostDataStream,
|
|
|
+ int64_t aPostDataStreamLength,
|
|
|
+ nsIInputStream* aHeadersDataStream,
|
|
|
+@@ -251,64 +273,64 @@ public:
|
|
|
+ NS_IMETHOD GetNestedFrameId(uint64_t*) override;
|
|
|
+ NS_IMETHOD GetIsContent(bool*) override;
|
|
|
+ NS_IMETHOD GetUsePrivateBrowsing(bool*) override;
|
|
|
+ NS_IMETHOD SetUsePrivateBrowsing(bool) override;
|
|
|
+ NS_IMETHOD SetPrivateBrowsing(bool) override;
|
|
|
+ NS_IMETHOD GetUseRemoteTabs(bool*) override;
|
|
|
+ NS_IMETHOD SetRemoteTabs(bool) override;
|
|
|
+ NS_IMETHOD GetScriptableOriginAttributes(JS::MutableHandle<JS::Value>) override;
|
|
|
++ NS_IMETHOD_(void) GetOriginAttributes(mozilla::OriginAttributes& aAttrs) override;
|
|
|
+
|
|
|
+ // Restores a cached presentation from history (mLSHE).
|
|
|
+ // This method swaps out the content viewer and simulates loads for
|
|
|
+ // subframes. It then simulates the completion of the toplevel load.
|
|
|
+ nsresult RestoreFromHistory();
|
|
|
+
|
|
|
+ // Perform a URI load from a refresh timer. This is just like the
|
|
|
+ // ForceRefreshURI method on nsIRefreshURI, but makes sure to take
|
|
|
+ // the timer involved out of mRefreshURIList if it's there.
|
|
|
+ // aTimer must not be null.
|
|
|
+ nsresult ForceRefreshURIFromTimer(nsIURI* aURI, nsIPrincipal* aPrincipal,
|
|
|
+ int32_t aDelay,
|
|
|
+ bool aMetaRefresh, nsITimer* aTimer);
|
|
|
+
|
|
|
+- friend class OnLinkClickEvent;
|
|
|
+-
|
|
|
+- static bool SandboxFlagsImplyCookies(const uint32_t &aSandboxFlags);
|
|
|
+-
|
|
|
+ // We need dummy OnLocationChange in some cases to update the UI without
|
|
|
+ // updating security info.
|
|
|
+ void FireDummyOnLocationChange()
|
|
|
+ {
|
|
|
+ FireOnLocationChange(this, nullptr, mCurrentURI,
|
|
|
+ LOCATION_CHANGE_SAME_DOCUMENT);
|
|
|
+ }
|
|
|
+
|
|
|
+ nsresult HistoryTransactionRemoved(int32_t aIndex);
|
|
|
+
|
|
|
+ // Notify Scroll observers when an async panning/zooming transform
|
|
|
+ // has started being applied
|
|
|
+ void NotifyAsyncPanZoomStarted();
|
|
|
++
|
|
|
+ // Notify Scroll observers when an async panning/zooming transform
|
|
|
+ // is no longer applied
|
|
|
+ void NotifyAsyncPanZoomStopped();
|
|
|
+
|
|
|
+ void SetInFrameSwap(bool aInSwap)
|
|
|
+ {
|
|
|
+ mInFrameSwap = aInSwap;
|
|
|
+ }
|
|
|
+ bool InFrameSwap();
|
|
|
+
|
|
|
+- const Encoding* GetForcedCharset() { return mForcedCharset; }
|
|
|
++ const mozilla::Encoding* GetForcedCharset() { return mForcedCharset; }
|
|
|
+
|
|
|
+ mozilla::HTMLEditor* GetHTMLEditorInternal();
|
|
|
+ nsresult SetHTMLEditorInternal(mozilla::HTMLEditor* aHTMLEditor);
|
|
|
+
|
|
|
+ nsDOMNavigationTiming* GetNavigationTiming() const;
|
|
|
+
|
|
|
++ nsresult SetOriginAttributes(const mozilla::OriginAttributes& aAttrs);
|
|
|
++
|
|
|
+ /**
|
|
|
+ * Get the list of ancestor principals for this docshell. The list is meant
|
|
|
+ * to be the list of principals of the documents this docshell is "nested
|
|
|
+ * through" in the sense of
|
|
|
+ * <https://html.spec.whatwg.org/multipage/browsers.html#browsing-context-nested-through>.
|
|
|
+ * In practice, it is defined as follows:
|
|
|
+ *
|
|
|
+ * If this is an <iframe mozbrowser> or a toplevel content docshell
|
|
|
+@@ -356,31 +378,38 @@ public:
|
|
|
+ *
|
|
|
+ * This method steals the data from the passed-in array.
|
|
|
+ */
|
|
|
+ void SetAncestorOuterWindowIDs(nsTArray<uint64_t>&& aAncestorOuterWindowIDs)
|
|
|
+ {
|
|
|
+ mAncestorOuterWindowIDs = mozilla::Move(aAncestorOuterWindowIDs);
|
|
|
+ }
|
|
|
+
|
|
|
+-private:
|
|
|
+- bool CanSetOriginAttributes();
|
|
|
+-
|
|
|
+-public:
|
|
|
+- const mozilla::OriginAttributes&
|
|
|
+- GetOriginAttributes()
|
|
|
++ const mozilla::OriginAttributes& GetOriginAttributes()
|
|
|
+ {
|
|
|
+ return mOriginAttributes;
|
|
|
+ }
|
|
|
+
|
|
|
+- nsresult SetOriginAttributes(const mozilla::OriginAttributes& aAttrs);
|
|
|
++ static bool SandboxFlagsImplyCookies(const uint32_t &aSandboxFlags);
|
|
|
++
|
|
|
++ // Tell the favicon service that aNewURI has the same favicon as aOldURI.
|
|
|
++ static void CopyFavicon(nsIURI* aOldURI,
|
|
|
++ nsIURI* aNewURI,
|
|
|
++ nsIPrincipal* aLoadingPrincipal,
|
|
|
++ bool aInPrivateBrowsing);
|
|
|
+
|
|
|
+-private:
|
|
|
+- // An observed docshell wrapper is created when recording markers is enabled.
|
|
|
+- mozilla::UniquePtr<mozilla::ObservedDocShell> mObserved;
|
|
|
++ static nsDocShell* Cast(nsIDocShell* aDocShell)
|
|
|
++ {
|
|
|
++ return static_cast<nsDocShell*>(aDocShell);
|
|
|
++ }
|
|
|
++
|
|
|
++private: // member functions
|
|
|
++ friend class nsDSURIContentListener;
|
|
|
++ friend class FramingChecker;
|
|
|
++ friend class OnLinkClickEvent;
|
|
|
+
|
|
|
+ // It is necessary to allow adding a timeline marker wherever a docshell
|
|
|
+ // instance is available. This operation happens frequently and needs to
|
|
|
+ // be very fast, so instead of using a Map or having to search for some
|
|
|
+ // docshell-specific markers storage, a pointer to an `ObservedDocShell` is
|
|
|
+ // is stored on docshells directly.
|
|
|
+ friend void mozilla::TimelineConsumers::AddConsumer(nsDocShell*);
|
|
|
+ friend void mozilla::TimelineConsumers::RemoveConsumer(nsDocShell*);
|
|
|
+@@ -389,60 +418,170 @@ private:
|
|
|
+ friend void mozilla::TimelineConsumers::AddMarkerForDocShell(
|
|
|
+ nsDocShell*, const char*, const TimeStamp&, MarkerTracingType,
|
|
|
+ MarkerStackRequest);
|
|
|
+ friend void mozilla::TimelineConsumers::AddMarkerForDocShell(
|
|
|
+ nsDocShell*, UniquePtr<AbstractTimelineMarker>&&);
|
|
|
+ friend void mozilla::TimelineConsumers::PopMarkers(nsDocShell*,
|
|
|
+ JSContext*, nsTArray<dom::ProfileTimelineMarker>&);
|
|
|
+
|
|
|
+-public:
|
|
|
+- // Tell the favicon service that aNewURI has the same favicon as aOldURI.
|
|
|
+- static void CopyFavicon(nsIURI* aOldURI,
|
|
|
+- nsIURI* aNewURI,
|
|
|
+- nsIPrincipal* aLoadingPrincipal,
|
|
|
+- bool aInPrivateBrowsing);
|
|
|
++ // Callback prototype for WalkHistoryEntries.
|
|
|
++ // aEntry is the child history entry, aShell is its corresponding docshell,
|
|
|
++ // aChildIndex is the child's index in its parent entry, and aData is
|
|
|
++ // the opaque pointer passed to WalkHistoryEntries.
|
|
|
++ typedef nsresult(*WalkHistoryEntriesFunc)(nsISHEntry* aEntry,
|
|
|
++ nsDocShell* aShell,
|
|
|
++ int32_t aChildIndex,
|
|
|
++ void* aData);
|
|
|
++
|
|
|
++ // Clone a session history tree for subframe navigation.
|
|
|
++ // The tree rooted at |aSrcEntry| will be cloned into |aDestEntry|, except
|
|
|
++ // for the entry with id |aCloneID|, which will be replaced with
|
|
|
++ // |aReplaceEntry|. |aSrcShell| is a (possibly null) docshell which
|
|
|
++ // corresponds to |aSrcEntry| via its mLSHE or mOHE pointers, and will
|
|
|
++ // have that pointer updated to point to the cloned history entry.
|
|
|
++ // If aCloneChildren is true then the children of the entry with id
|
|
|
++ // |aCloneID| will be cloned into |aReplaceEntry|.
|
|
|
++ static nsresult CloneAndReplace(nsISHEntry* aSrcEntry,
|
|
|
++ nsDocShell* aSrcShell,
|
|
|
++ uint32_t aCloneID,
|
|
|
++ nsISHEntry* aReplaceEntry,
|
|
|
++ bool aCloneChildren,
|
|
|
++ nsISHEntry** aDestEntry);
|
|
|
+
|
|
|
+- static nsDocShell* Cast(nsIDocShell* aDocShell)
|
|
|
++ // Child-walking callback for CloneAndReplace
|
|
|
++ static nsresult CloneAndReplaceChild(nsISHEntry* aEntry, nsDocShell* aShell,
|
|
|
++ int32_t aChildIndex, void* aData);
|
|
|
++
|
|
|
++
|
|
|
++ // Child-walking callback for SetHistoryEntry
|
|
|
++ static nsresult SetChildHistoryEntry(nsISHEntry* aEntry, nsDocShell* aShell,
|
|
|
++ int32_t aEntryIndex, void* aData);
|
|
|
++
|
|
|
++ // For each child of aRootEntry, find the corresponding docshell which is
|
|
|
++ // a child of aRootShell, and call aCallback. The opaque pointer aData
|
|
|
++ // is passed to the callback.
|
|
|
++ static nsresult WalkHistoryEntries(nsISHEntry* aRootEntry,
|
|
|
++ nsDocShell* aRootShell,
|
|
|
++ WalkHistoryEntriesFunc aCallback,
|
|
|
++ void* aData);
|
|
|
++
|
|
|
++ // Security checks to prevent frameset spoofing. See comments at
|
|
|
++ // implementation sites.
|
|
|
++ static bool CanAccessItem(nsIDocShellTreeItem* aTargetItem,
|
|
|
++ nsIDocShellTreeItem* aAccessingItem,
|
|
|
++ bool aConsiderOpener = true);
|
|
|
++ static bool ValidateOrigin(nsIDocShellTreeItem* aOriginTreeItem,
|
|
|
++ nsIDocShellTreeItem* aTargetTreeItem);
|
|
|
++
|
|
|
++ static inline uint32_t PRTimeToSeconds(PRTime aTimeUsec)
|
|
|
+ {
|
|
|
+- return static_cast<nsDocShell*>(aDocShell);
|
|
|
++ PRTime usecPerSec = PR_USEC_PER_SEC;
|
|
|
++ return uint32_t(aTimeUsec /= usecPerSec);
|
|
|
+ }
|
|
|
+
|
|
|
+-protected:
|
|
|
++ static const nsCString FrameTypeToString(uint32_t aFrameType)
|
|
|
++ {
|
|
|
++ switch (aFrameType) {
|
|
|
++ case FRAME_TYPE_BROWSER:
|
|
|
++ return NS_LITERAL_CSTRING("browser");
|
|
|
++ case FRAME_TYPE_REGULAR:
|
|
|
++ return NS_LITERAL_CSTRING("regular");
|
|
|
++ default:
|
|
|
++ NS_ERROR("Unknown frame type");
|
|
|
++ return EmptyCString();
|
|
|
++ }
|
|
|
++ }
|
|
|
++
|
|
|
+ virtual ~nsDocShell();
|
|
|
++
|
|
|
++ //
|
|
|
++ // nsDocLoader
|
|
|
++ //
|
|
|
++
|
|
|
+ virtual void DestroyChildren() override;
|
|
|
+
|
|
|
++ // Overridden from nsDocLoader, this provides more information than the
|
|
|
++ // normal OnStateChange with flags STATE_REDIRECTING
|
|
|
++ virtual void OnRedirectStateChange(nsIChannel* aOldChannel,
|
|
|
++ nsIChannel* aNewChannel,
|
|
|
++ uint32_t aRedirectFlags,
|
|
|
++ uint32_t aStateFlags) override;
|
|
|
++
|
|
|
++ // Override the parent setter from nsDocLoader
|
|
|
++ virtual nsresult SetDocLoaderParent(nsDocLoader* aLoader) override;
|
|
|
++
|
|
|
++ //
|
|
|
+ // Content Viewer Management
|
|
|
++ //
|
|
|
++
|
|
|
+ nsresult EnsureContentViewer();
|
|
|
++
|
|
|
+ // aPrincipal can be passed in if the caller wants. If null is
|
|
|
+ // passed in, the about:blank principal will end up being used.
|
|
|
+ nsresult CreateAboutBlankContentViewer(nsIPrincipal* aPrincipal,
|
|
|
+ nsIURI* aBaseURI,
|
|
|
+ bool aTryToSaveOldPresentation = true,
|
|
|
+ bool aCheckPermitUnload = true);
|
|
|
++
|
|
|
+ nsresult CreateContentViewer(const nsACString& aContentType,
|
|
|
+ nsIRequest* aRequest,
|
|
|
+ nsIStreamListener** aContentHandler);
|
|
|
++
|
|
|
+ nsresult NewContentViewerObj(const nsACString& aContentType,
|
|
|
+ nsIRequest* aRequest, nsILoadGroup* aLoadGroup,
|
|
|
+ nsIStreamListener** aContentHandler,
|
|
|
+ nsIContentViewer** aViewer);
|
|
|
++
|
|
|
+ nsresult SetupNewViewer(nsIContentViewer* aNewViewer);
|
|
|
+
|
|
|
+- void SetupReferrerFromChannel(nsIChannel* aChannel);
|
|
|
++ //
|
|
|
++ // Session History
|
|
|
++ //
|
|
|
++
|
|
|
++ bool ShouldAddToSessionHistory(nsIURI* aURI, nsIChannel* aChannel);
|
|
|
+
|
|
|
+- nsresult GetEldestPresContext(nsPresContext** aPresContext);
|
|
|
++ // Either aChannel or aOwner must be null. If aChannel is
|
|
|
++ // present, the owner should be gotten from it.
|
|
|
++ // If aCloneChildren is true, then our current session history's
|
|
|
++ // children will be cloned onto the new entry. This should be
|
|
|
++ // used when we aren't actually changing the document while adding
|
|
|
++ // the new session history entry.
|
|
|
++
|
|
|
++ nsresult AddToSessionHistory(nsIURI* aURI, nsIChannel* aChannel,
|
|
|
++ nsIPrincipal* aTriggeringPrincipal,
|
|
|
++ nsIPrincipal* aPrincipalToInherit,
|
|
|
++ bool aCloneChildren,
|
|
|
++ nsISHEntry** aNewEntry);
|
|
|
++
|
|
|
++ nsresult AddChildSHEntryToParent(nsISHEntry* aNewEntry, int32_t aChildOffset,
|
|
|
++ bool aCloneChildren);
|
|
|
+
|
|
|
+- // Get the principal that we'll set on the channel if we're inheriting. If
|
|
|
+- // aConsiderCurrentDocument is true, we try to use the current document if
|
|
|
+- // at all possible. If that fails, we fall back on the parent document.
|
|
|
+- // If that fails too, we force creation of a content viewer and use the
|
|
|
+- // resulting principal. If aConsiderCurrentDocument is false, we just look
|
|
|
+- // at the parent.
|
|
|
+- nsIPrincipal* GetInheritedPrincipal(bool aConsiderCurrentDocument);
|
|
|
++ nsresult AddChildSHEntryInternal(nsISHEntry* aCloneRef, nsISHEntry* aNewEntry,
|
|
|
++ int32_t aChildOffset, uint32_t aLoadType,
|
|
|
++ bool aCloneChildren);
|
|
|
++
|
|
|
++ // Determine whether this docshell corresponds to the given history entry,
|
|
|
++ // via having a pointer to it in mOSHE or mLSHE.
|
|
|
++ bool HasHistoryEntry(nsISHEntry* aEntry) const
|
|
|
++ {
|
|
|
++ return aEntry && (aEntry == mOSHE || aEntry == mLSHE);
|
|
|
++ }
|
|
|
++
|
|
|
++ // Update any pointers (mOSHE or mLSHE) to aOldEntry to point to aNewEntry
|
|
|
++ void SwapHistoryEntries(nsISHEntry* aOldEntry, nsISHEntry* aNewEntry);
|
|
|
++
|
|
|
++ // Call this method to swap in a new history entry to m[OL]SHE, rather than
|
|
|
++ // setting it directly. This completes the navigation in all docshells
|
|
|
++ // in the case of a subframe navigation.
|
|
|
++ void SetHistoryEntry(nsCOMPtr<nsISHEntry>* aPtr, nsISHEntry* aEntry);
|
|
|
++
|
|
|
++ //
|
|
|
++ // URI Load
|
|
|
++ //
|
|
|
+
|
|
|
+ // Actually open a channel and perform a URI load. Callers need to pass a
|
|
|
+ // non-null aTriggeringPrincipal which initiated the URI load. Please note
|
|
|
+ // that aTriggeringPrincipal will be used for performing security checks.
|
|
|
+ // If the argument aURI is provided by the web, then please do not pass a
|
|
|
+ // SystemPrincipal as the triggeringPrincipal. If principalToInherit is
|
|
|
+ // null, then no inheritance of any sort will happen and the load will
|
|
|
+ // get a principal based on the URI being loaded.
|
|
|
+@@ -472,18 +611,20 @@ protected:
|
|
|
+ nsIDocShell** aDocShell,
|
|
|
+ nsIRequest** aRequest,
|
|
|
+ bool aIsNewWindowTarget,
|
|
|
+ bool aBypassClassifier,
|
|
|
+ bool aForceAllowCookies,
|
|
|
+ const nsAString& aSrcdoc,
|
|
|
+ nsIURI* aBaseURI,
|
|
|
+ nsContentPolicyType aContentPolicyType);
|
|
|
++
|
|
|
+ nsresult AddHeadersToChannel(nsIInputStream* aHeadersData,
|
|
|
+ nsIChannel* aChannel);
|
|
|
++
|
|
|
+ nsresult DoChannelLoad(nsIChannel* aChannel,
|
|
|
+ nsIURILoader* aURILoader,
|
|
|
+ bool aBypassClassifier);
|
|
|
+
|
|
|
+ nsresult ScrollToAnchor(bool aCurHasRef,
|
|
|
+ bool aNewHasRef,
|
|
|
+ nsACString& aNewHash,
|
|
|
+ uint32_t aLoadType);
|
|
|
+@@ -509,107 +650,52 @@ protected:
|
|
|
+ bool OnNewURI(nsIURI* aURI, nsIChannel* aChannel,
|
|
|
+ nsIPrincipal* aTriggeringPrincipal,
|
|
|
+ nsIPrincipal* aPrincipalToInherit,
|
|
|
+ uint32_t aLoadType,
|
|
|
+ bool aFireOnLocationChange,
|
|
|
+ bool aAddToGlobalHistory,
|
|
|
+ bool aCloneSHChildren);
|
|
|
+
|
|
|
+- void SetReferrerURI(nsIURI* aURI);
|
|
|
+- void SetReferrerPolicy(uint32_t aReferrerPolicy);
|
|
|
++ // Helper method that is called when a new document (including any
|
|
|
++ // sub-documents - ie. frames) has been completely loaded.
|
|
|
++ nsresult EndPageLoad(nsIWebProgress* aProgress,
|
|
|
++ nsIChannel* aChannel,
|
|
|
++ nsresult aResult);
|
|
|
+
|
|
|
+- // Session History
|
|
|
+- bool ShouldAddToSessionHistory(nsIURI* aURI, nsIChannel* aChannel);
|
|
|
+- // Either aChannel or aOwner must be null. If aChannel is
|
|
|
+- // present, the owner should be gotten from it.
|
|
|
+- // If aCloneChildren is true, then our current session history's
|
|
|
+- // children will be cloned onto the new entry. This should be
|
|
|
+- // used when we aren't actually changing the document while adding
|
|
|
+- // the new session history entry.
|
|
|
+- nsresult AddToSessionHistory(nsIURI* aURI, nsIChannel* aChannel,
|
|
|
+- nsIPrincipal* aTriggeringPrincipal,
|
|
|
+- nsIPrincipal* aPrincipalToInherit,
|
|
|
+- bool aCloneChildren,
|
|
|
+- nsISHEntry** aNewEntry);
|
|
|
+- nsresult AddChildSHEntryToParent(nsISHEntry* aNewEntry, int32_t aChildOffset,
|
|
|
+- bool aCloneChildren);
|
|
|
+-
|
|
|
+- nsresult AddChildSHEntryInternal(nsISHEntry* aCloneRef, nsISHEntry* aNewEntry,
|
|
|
+- int32_t aChildOffset, uint32_t aLoadType,
|
|
|
+- bool aCloneChildren);
|
|
|
+-
|
|
|
+- nsresult LoadHistoryEntry(nsISHEntry* aEntry, uint32_t aLoadType);
|
|
|
+- nsresult PersistLayoutHistoryState();
|
|
|
+
|
|
|
+- // Clone a session history tree for subframe navigation.
|
|
|
+- // The tree rooted at |aSrcEntry| will be cloned into |aDestEntry|, except
|
|
|
+- // for the entry with id |aCloneID|, which will be replaced with
|
|
|
+- // |aReplaceEntry|. |aSrcShell| is a (possibly null) docshell which
|
|
|
+- // corresponds to |aSrcEntry| via its mLSHE or mOHE pointers, and will
|
|
|
+- // have that pointer updated to point to the cloned history entry.
|
|
|
+- // If aCloneChildren is true then the children of the entry with id
|
|
|
+- // |aCloneID| will be cloned into |aReplaceEntry|.
|
|
|
+- static nsresult CloneAndReplace(nsISHEntry* aSrcEntry,
|
|
|
+- nsDocShell* aSrcShell,
|
|
|
+- uint32_t aCloneID,
|
|
|
+- nsISHEntry* aReplaceEntry,
|
|
|
+- bool aCloneChildren,
|
|
|
+- nsISHEntry** aDestEntry);
|
|
|
++ nsresult LoadErrorPage(nsIURI* aURI, const char16_t* aURL,
|
|
|
++ const char* aErrorPage,
|
|
|
++ const char* aErrorType,
|
|
|
++ const char16_t* aDescription,
|
|
|
++ const char* aCSSClass,
|
|
|
++ nsIChannel* aFailedChannel);
|
|
|
+
|
|
|
+- // Child-walking callback for CloneAndReplace
|
|
|
+- static nsresult CloneAndReplaceChild(nsISHEntry* aEntry, nsDocShell* aShell,
|
|
|
+- int32_t aChildIndex, void* aData);
|
|
|
+-
|
|
|
+- nsresult GetRootSessionHistory(nsISHistory** aReturn);
|
|
|
+- nsresult GetHttpChannel(nsIChannel* aChannel, nsIHttpChannel** aReturn);
|
|
|
+- bool ShouldDiscardLayoutState(nsIHttpChannel* aChannel);
|
|
|
+-
|
|
|
+- // Determine whether this docshell corresponds to the given history entry,
|
|
|
+- // via having a pointer to it in mOSHE or mLSHE.
|
|
|
+- bool HasHistoryEntry(nsISHEntry* aEntry) const
|
|
|
++ bool DisplayLoadError(nsresult aError, nsIURI* aURI, const char16_t* aURL,
|
|
|
++ nsIChannel* aFailedChannel)
|
|
|
+ {
|
|
|
+- return aEntry && (aEntry == mOSHE || aEntry == mLSHE);
|
|
|
++ bool didDisplayLoadError = false;
|
|
|
++ DisplayLoadError(aError, aURI, aURL, aFailedChannel, &didDisplayLoadError);
|
|
|
++ return didDisplayLoadError;
|
|
|
+ }
|
|
|
+
|
|
|
+- // Update any pointers (mOSHE or mLSHE) to aOldEntry to point to aNewEntry
|
|
|
+- void SwapHistoryEntries(nsISHEntry* aOldEntry, nsISHEntry* aNewEntry);
|
|
|
+-
|
|
|
+- // Call this method to swap in a new history entry to m[OL]SHE, rather than
|
|
|
+- // setting it directly. This completes the navigation in all docshells
|
|
|
+- // in the case of a subframe navigation.
|
|
|
+- void SetHistoryEntry(nsCOMPtr<nsISHEntry>* aPtr, nsISHEntry* aEntry);
|
|
|
+-
|
|
|
+- // Child-walking callback for SetHistoryEntry
|
|
|
+- static nsresult SetChildHistoryEntry(nsISHEntry* aEntry, nsDocShell* aShell,
|
|
|
+- int32_t aEntryIndex, void* aData);
|
|
|
++ //
|
|
|
++ // Uncategorized
|
|
|
++ //
|
|
|
+
|
|
|
+- // Callback prototype for WalkHistoryEntries.
|
|
|
+- // aEntry is the child history entry, aShell is its corresponding docshell,
|
|
|
+- // aChildIndex is the child's index in its parent entry, and aData is
|
|
|
+- // the opaque pointer passed to WalkHistoryEntries.
|
|
|
+- typedef nsresult(*WalkHistoryEntriesFunc)(nsISHEntry* aEntry,
|
|
|
+- nsDocShell* aShell,
|
|
|
+- int32_t aChildIndex,
|
|
|
+- void* aData);
|
|
|
++ // Get the principal that we'll set on the channel if we're inheriting. If
|
|
|
++ // aConsiderCurrentDocument is true, we try to use the current document if
|
|
|
++ // at all possible. If that fails, we fall back on the parent document.
|
|
|
++ // If that fails too, we force creation of a content viewer and use the
|
|
|
++ // resulting principal. If aConsiderCurrentDocument is false, we just look
|
|
|
++ // at the parent.
|
|
|
++ nsIPrincipal* GetInheritedPrincipal(bool aConsiderCurrentDocument);
|
|
|
+
|
|
|
+- // For each child of aRootEntry, find the corresponding docshell which is
|
|
|
+- // a child of aRootShell, and call aCallback. The opaque pointer aData
|
|
|
+- // is passed to the callback.
|
|
|
+- static nsresult WalkHistoryEntries(nsISHEntry* aRootEntry,
|
|
|
+- nsDocShell* aRootShell,
|
|
|
+- WalkHistoryEntriesFunc aCallback,
|
|
|
+- void* aData);
|
|
|
+-
|
|
|
+- // overridden from nsDocLoader, this provides more information than the
|
|
|
+- // normal OnStateChange with flags STATE_REDIRECTING
|
|
|
+- virtual void OnRedirectStateChange(nsIChannel* aOldChannel,
|
|
|
+- nsIChannel* aNewChannel,
|
|
|
+- uint32_t aRedirectFlags,
|
|
|
+- uint32_t aStateFlags) override;
|
|
|
++ nsresult CreatePrincipalFromReferrer(nsIURI* aReferrer,
|
|
|
++ nsIPrincipal** aResult);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Helper function that determines if channel is an HTTP POST.
|
|
|
+ *
|
|
|
+ * @param aChannel
|
|
|
+ * The channel to test
|
|
|
+ *
|
|
|
+ * @return True iff channel is an HTTP post.
|
|
|
+@@ -676,76 +762,21 @@ protected:
|
|
|
+ * For HTTP channels, the response code (0 otherwise).
|
|
|
+ */
|
|
|
+ void AddURIVisit(nsIURI* aURI,
|
|
|
+ nsIURI* aReferrerURI,
|
|
|
+ nsIURI* aPreviousURI,
|
|
|
+ uint32_t aChannelRedirectFlags,
|
|
|
+ uint32_t aResponseStatus = 0);
|
|
|
+
|
|
|
+- // Helper Routines
|
|
|
+- nsresult ConfirmRepost(bool* aRepost);
|
|
|
+- NS_IMETHOD GetPromptAndStringBundle(nsIPrompt** aPrompt,
|
|
|
+- nsIStringBundle** aStringBundle);
|
|
|
+- NS_IMETHOD GetChildOffset(nsIDOMNode* aChild, nsIDOMNode* aParent,
|
|
|
+- int32_t* aOffset);
|
|
|
+- nsIScrollableFrame* GetRootScrollFrame();
|
|
|
+- NS_IMETHOD EnsureScriptEnvironment();
|
|
|
+- NS_IMETHOD EnsureEditorData();
|
|
|
+- nsresult EnsureTransferableHookData();
|
|
|
+- NS_IMETHOD EnsureFind();
|
|
|
+- nsresult RefreshURIFromQueue();
|
|
|
+- NS_IMETHOD LoadErrorPage(nsIURI* aURI, const char16_t* aURL,
|
|
|
+- const char* aErrorPage,
|
|
|
+- const char* aErrorType,
|
|
|
+- const char16_t* aDescription,
|
|
|
+- const char* aCSSClass,
|
|
|
+- nsIChannel* aFailedChannel);
|
|
|
+- bool IsPrintingOrPP(bool aDisplayErrorDialog = true);
|
|
|
+- bool IsNavigationAllowed(bool aDisplayPrintErrorDialog = true,
|
|
|
+- bool aCheckIfUnloadFired = true);
|
|
|
+-
|
|
|
+- nsresult SetBaseUrlForWyciwyg(nsIContentViewer* aContentViewer);
|
|
|
+-
|
|
|
+- static inline uint32_t PRTimeToSeconds(PRTime aTimeUsec)
|
|
|
+- {
|
|
|
+- PRTime usecPerSec = PR_USEC_PER_SEC;
|
|
|
+- return uint32_t(aTimeUsec /= usecPerSec);
|
|
|
+- }
|
|
|
+-
|
|
|
+- inline bool UseErrorPages()
|
|
|
+- {
|
|
|
+- return (mObserveErrorPages ? sUseErrorPages : mUseErrorPages);
|
|
|
+- }
|
|
|
+-
|
|
|
+- bool IsFrame();
|
|
|
+-
|
|
|
+- //
|
|
|
+- // Helper method that is called when a new document (including any
|
|
|
+- // sub-documents - ie. frames) has been completely loaded.
|
|
|
+- //
|
|
|
+- virtual nsresult EndPageLoad(nsIWebProgress* aProgress,
|
|
|
+- nsIChannel* aChannel,
|
|
|
+- nsresult aResult);
|
|
|
+-
|
|
|
+ // Sets the current document's current state object to the given SHEntry's
|
|
|
+ // state object. The current state object is eventually given to the page
|
|
|
+ // in the PopState event.
|
|
|
+ nsresult SetDocCurrentStateObj(nsISHEntry* aShEntry);
|
|
|
+
|
|
|
+- nsresult CheckLoadingPermissions();
|
|
|
+-
|
|
|
+- // Security checks to prevent frameset spoofing. See comments at
|
|
|
+- // implementation sites.
|
|
|
+- static bool CanAccessItem(nsIDocShellTreeItem* aTargetItem,
|
|
|
+- nsIDocShellTreeItem* aAccessingItem,
|
|
|
+- bool aConsiderOpener = true);
|
|
|
+- static bool ValidateOrigin(nsIDocShellTreeItem* aOriginTreeItem,
|
|
|
+- nsIDocShellTreeItem* aTargetTreeItem);
|
|
|
+-
|
|
|
+ // Returns true if would have called FireOnLocationChange,
|
|
|
+ // but did not because aFireOnLocationChange was false on entry.
|
|
|
+ // In this case it is the caller's responsibility to ensure
|
|
|
+ // FireOnLocationChange is called.
|
|
|
+ // In all other cases false is returned.
|
|
|
+ bool SetCurrentURI(nsIURI* aURI, nsIRequest* aRequest,
|
|
|
+ bool aFireOnLocationChange,
|
|
|
+ uint32_t aLocationFlags);
|
|
|
+@@ -805,32 +836,19 @@ protected:
|
|
|
+ void DoGetPositionAndSize(int32_t* aX, int32_t* aY, int32_t* aWidth,
|
|
|
+ int32_t* aHeight);
|
|
|
+
|
|
|
+ // Call this when a URI load is handed to us (via OnLinkClick or
|
|
|
+ // InternalLoad). This makes sure that we're not inside unload, or that if
|
|
|
+ // we are it's still OK to load this URI.
|
|
|
+ bool IsOKToLoadURI(nsIURI* aURI);
|
|
|
+
|
|
|
+- void ReattachEditorToWindow(nsISHEntry* aSHEntry);
|
|
|
+-
|
|
|
+- nsCOMPtr<nsIDOMStorageManager> mSessionStorageManager;
|
|
|
+- nsIDOMStorageManager* TopSessionStorageManager();
|
|
|
+-
|
|
|
+ // helpers for executing commands
|
|
|
+ nsresult GetControllerForCommand(const char* aCommand,
|
|
|
+ nsIController** aResult);
|
|
|
+- nsresult EnsureCommandHandler();
|
|
|
+-
|
|
|
+- nsIChannel* GetCurrentDocChannel();
|
|
|
+-
|
|
|
+- bool ShouldBlockLoadingForBackButton();
|
|
|
+-
|
|
|
+- // Convenience method for getting our parent docshell. Can return null
|
|
|
+- already_AddRefed<nsDocShell> GetParentDocshell();
|
|
|
+
|
|
|
+ // Possibly create a ClientSource object to represent an initial about:blank
|
|
|
+ // window that has not been allocated yet. Normally we try not to create
|
|
|
+ // this about:blank window until something calls GetDocument(). We still need
|
|
|
+ // the ClientSource to exist for this conceptual window, though.
|
|
|
+ //
|
|
|
+ // The ClientSource is created with the given principal if specified. If
|
|
|
+ // the principal is not provided we will attempt to inherit it when we
|
|
|
+@@ -842,120 +860,163 @@ protected:
|
|
|
+ void MaybeCreateInitialClientSource(nsIPrincipal* aPrincipal = nullptr);
|
|
|
+
|
|
|
+ // Return the ClientInfo for the initial about:blank window, if it exists
|
|
|
+ // or we have speculatively created a ClientSource in
|
|
|
+ // MaybeCreateInitialClientSource(). This can return a ClientInfo object
|
|
|
+ // even if GetExtantDoc() returns nullptr.
|
|
|
+ mozilla::Maybe<mozilla::dom::ClientInfo> GetInitialClientInfo() const;
|
|
|
+
|
|
|
+-protected:
|
|
|
+- nsresult GetCurScrollPos(int32_t aScrollOrientation, int32_t* aCurPos);
|
|
|
+- nsresult SetCurScrollPosEx(int32_t aCurHorizontalPos,
|
|
|
+- int32_t aCurVerticalPos);
|
|
|
+-
|
|
|
+- // Override the parent setter from nsDocLoader
|
|
|
+- virtual nsresult SetDocLoaderParent(nsDocLoader* aLoader) override;
|
|
|
+-
|
|
|
+- void ClearFrameHistory(nsISHEntry* aEntry);
|
|
|
+-
|
|
|
+ /**
|
|
|
+ * Initializes mTiming if it isn't yet.
|
|
|
+ * After calling this, mTiming is non-null. This method returns true if the
|
|
|
+ * initialization of the Timing can be reset (basically this is true if a new
|
|
|
+ * Timing object is created).
|
|
|
+ * In case the loading is aborted, MaybeResetInitTiming() can be called
|
|
|
+ * passing the return value of MaybeInitTiming(): if it's possible to reset
|
|
|
+ * the Timing, this method will do it.
|
|
|
+ */
|
|
|
+ MOZ_MUST_USE bool MaybeInitTiming();
|
|
|
+ void MaybeResetInitTiming(bool aReset);
|
|
|
+
|
|
|
+- bool DisplayLoadError(nsresult aError, nsIURI* aURI, const char16_t* aURL,
|
|
|
+- nsIChannel* aFailedChannel)
|
|
|
++ // Separate function to do the actual name (i.e. not _top, _self etc.)
|
|
|
++ // searching for FindItemWithName.
|
|
|
++ nsresult DoFindItemWithName(const nsAString& aName,
|
|
|
++ nsIDocShellTreeItem* aRequestor,
|
|
|
++ nsIDocShellTreeItem* aOriginalRequestor,
|
|
|
++ bool aSkipTabGroup,
|
|
|
++ nsIDocShellTreeItem** aResult);
|
|
|
++
|
|
|
++ // Convenience method for getting our parent docshell. Can return null
|
|
|
++ already_AddRefed<nsDocShell> GetParentDocshell();
|
|
|
++
|
|
|
++ // Helper assertion to enforce that mInPrivateBrowsing is in sync with
|
|
|
++ // OriginAttributes.mPrivateBrowsingId
|
|
|
++ void AssertOriginAttributesMatchPrivateBrowsing();
|
|
|
++
|
|
|
++ // Notify consumers of a search being loaded through the observer service:
|
|
|
++ void MaybeNotifyKeywordSearchLoading(const nsString& aProvider,
|
|
|
++ const nsString& aKeyword);
|
|
|
++
|
|
|
++ // Internal implementation of nsIDocShell::FirePageHideNotification.
|
|
|
++ // If aSkipCheckingDynEntries is true, it will not try to remove dynamic
|
|
|
++ // subframe entries. This is to avoid redundant RemoveDynEntries calls in all
|
|
|
++ // children docshells.
|
|
|
++ void FirePageHideNotificationInternal(bool aIsUnload,
|
|
|
++ bool aSkipCheckingDynEntries);
|
|
|
++
|
|
|
++ // Dispatch a runnable to the TabGroup associated to this docshell.
|
|
|
++ nsresult DispatchToTabGroup(mozilla::TaskCategory aCategory,
|
|
|
++ already_AddRefed<nsIRunnable>&& aRunnable);
|
|
|
++
|
|
|
++ NS_IMETHOD GetChildOffset(nsIDOMNode* aChild, nsIDOMNode* aParent,
|
|
|
++ int32_t* aOffset);
|
|
|
++
|
|
|
++ void SetupReferrerFromChannel(nsIChannel* aChannel);
|
|
|
++ void SetReferrerURI(nsIURI* aURI);
|
|
|
++ void SetReferrerPolicy(uint32_t aReferrerPolicy);
|
|
|
++ void ReattachEditorToWindow(nsISHEntry* aSHEntry);
|
|
|
++ void RecomputeCanExecuteScripts();
|
|
|
++ void ClearFrameHistory(nsISHEntry* aEntry);
|
|
|
++ void UpdateGlobalHistoryTitle(nsIURI* aURI);
|
|
|
++ bool IsFrame();
|
|
|
++ bool CanSetOriginAttributes();
|
|
|
++ bool ShouldBlockLoadingForBackButton();
|
|
|
++ bool ShouldDiscardLayoutState(nsIHttpChannel* aChannel);
|
|
|
++ bool HasUnloadedParent();
|
|
|
++ bool JustStartedNetworkLoad();
|
|
|
++ bool IsPrintingOrPP(bool aDisplayErrorDialog = true);
|
|
|
++ bool IsNavigationAllowed(bool aDisplayPrintErrorDialog = true,
|
|
|
++ bool aCheckIfUnloadFired = true);
|
|
|
++ uint32_t GetInheritedFrameType();
|
|
|
++ nsIScrollableFrame* GetRootScrollFrame();
|
|
|
++ nsIDOMStorageManager* TopSessionStorageManager();
|
|
|
++ nsIChannel* GetCurrentDocChannel();
|
|
|
++ nsresult EnsureScriptEnvironment();
|
|
|
++ nsresult EnsureEditorData();
|
|
|
++ nsresult EnsureTransferableHookData();
|
|
|
++ nsresult EnsureFind();
|
|
|
++ nsresult EnsureCommandHandler();
|
|
|
++ nsresult RefreshURIFromQueue();
|
|
|
++ nsresult GetEldestPresContext(nsPresContext** aPresContext);
|
|
|
++ nsresult CheckLoadingPermissions();
|
|
|
++ nsresult PersistLayoutHistoryState();
|
|
|
++ nsresult LoadHistoryEntry(nsISHEntry* aEntry, uint32_t aLoadType);
|
|
|
++ nsresult SetBaseUrlForWyciwyg(nsIContentViewer* aContentViewer);
|
|
|
++ nsresult GetRootSessionHistory(nsISHistory** aReturn);
|
|
|
++ nsresult GetHttpChannel(nsIChannel* aChannel, nsIHttpChannel** aReturn);
|
|
|
++ nsresult ConfirmRepost(bool* aRepost);
|
|
|
++ nsresult GetPromptAndStringBundle(nsIPrompt** aPrompt,
|
|
|
++ nsIStringBundle** aStringBundle);
|
|
|
++ nsresult GetCurScrollPos(int32_t aScrollOrientation, int32_t* aCurPos);
|
|
|
++ nsresult SetCurScrollPosEx(int32_t aCurHorizontalPos,
|
|
|
++ int32_t aCurVerticalPos);
|
|
|
++
|
|
|
++ inline bool UseErrorPages()
|
|
|
+ {
|
|
|
+- bool didDisplayLoadError = false;
|
|
|
+- DisplayLoadError(aError, aURI, aURL, aFailedChannel, &didDisplayLoadError);
|
|
|
+- return didDisplayLoadError;
|
|
|
++ return (mObserveErrorPages ? sUseErrorPages : mUseErrorPages);
|
|
|
+ }
|
|
|
+
|
|
|
+-public:
|
|
|
+- // Event type dispatched by RestorePresentation
|
|
|
+- class RestorePresentationEvent : public mozilla::Runnable
|
|
|
+- {
|
|
|
+- public:
|
|
|
+- NS_DECL_NSIRUNNABLE
|
|
|
+- explicit RestorePresentationEvent(nsDocShell* aDs)
|
|
|
+- : mozilla::Runnable("nsDocShell::RestorePresentationEvent")
|
|
|
+- , mDocShell(aDs)
|
|
|
+- {
|
|
|
+- }
|
|
|
+- void Revoke() { mDocShell = nullptr; }
|
|
|
+- private:
|
|
|
+- RefPtr<nsDocShell> mDocShell;
|
|
|
+- };
|
|
|
++private: // data members
|
|
|
++ static nsIURIFixup* sURIFixup;
|
|
|
+
|
|
|
+-protected:
|
|
|
+- bool JustStartedNetworkLoad();
|
|
|
++ // Cached value of the "browser.xul.error_pages.enabled" preference.
|
|
|
++ static bool sUseErrorPages;
|
|
|
++
|
|
|
++#ifdef DEBUG
|
|
|
++ // We're counting the number of |nsDocShells| to help find leaks
|
|
|
++ static unsigned long gNumberOfDocShells;
|
|
|
++#endif /* DEBUG */
|
|
|
+
|
|
|
+- nsresult CreatePrincipalFromReferrer(nsIURI* aReferrer,
|
|
|
+- nsIPrincipal** aResult);
|
|
|
+-
|
|
|
+- static const nsCString FrameTypeToString(uint32_t aFrameType)
|
|
|
+- {
|
|
|
+- switch (aFrameType) {
|
|
|
+- case FRAME_TYPE_BROWSER:
|
|
|
+- return NS_LITERAL_CSTRING("browser");
|
|
|
+- case FRAME_TYPE_REGULAR:
|
|
|
+- return NS_LITERAL_CSTRING("regular");
|
|
|
+- default:
|
|
|
+- NS_ERROR("Unknown frame type");
|
|
|
+- return EmptyCString();
|
|
|
+- }
|
|
|
+- }
|
|
|
+-
|
|
|
+- uint32_t GetInheritedFrameType();
|
|
|
+-
|
|
|
+- bool HasUnloadedParent();
|
|
|
+-
|
|
|
+- void UpdateGlobalHistoryTitle(nsIURI* aURI);
|
|
|
+-
|
|
|
+- NS_IMETHOD_(void) GetOriginAttributes(mozilla::OriginAttributes& aAttrs) override;
|
|
|
++ nsID mHistoryID;
|
|
|
++ nsString mName;
|
|
|
++ nsString mTitle;
|
|
|
++ nsString mCustomUserAgent;
|
|
|
++ nsCString mOriginalUriString;
|
|
|
++ nsWeakPtr mOnePermittedSandboxedNavigator;
|
|
|
++ nsWeakPtr mOpener;
|
|
|
++ nsTObserverArray<nsWeakPtr> mPrivacyObservers;
|
|
|
++ nsTObserverArray<nsWeakPtr> mReflowObservers;
|
|
|
++ nsTObserverArray<nsWeakPtr> mScrollObservers;
|
|
|
++ mozilla::OriginAttributes mOriginAttributes;
|
|
|
++ mozilla::UniquePtr<mozilla::dom::ClientSource> mInitialClientSource;
|
|
|
++ RefPtr<nsDOMNavigationTiming> mTiming;
|
|
|
++ RefPtr<nsDSURIContentListener> mContentListener;
|
|
|
++ RefPtr<nsGlobalWindow> mScriptGlobal;
|
|
|
++ nsCOMPtr<nsIPrincipal> mParentCharsetPrincipal;
|
|
|
++ nsCOMPtr<nsIMutableArray> mRefreshURIList;
|
|
|
++ nsCOMPtr<nsIMutableArray> mSavedRefreshURIList;
|
|
|
++ nsCOMPtr<nsIDOMStorageManager> mSessionStorageManager;
|
|
|
++ nsCOMPtr<nsIContentViewer> mContentViewer;
|
|
|
++ nsCOMPtr<nsIWidget> mParentWidget;
|
|
|
++ nsCOMPtr<nsISHistory> mSessionHistory;
|
|
|
++ nsCOMPtr<nsIGlobalHistory2> mGlobalHistory;
|
|
|
++ nsCOMPtr<nsIWebBrowserFind> mFind;
|
|
|
++ nsCOMPtr<nsICommandManager> mCommandManager;
|
|
|
+
|
|
|
+ // Dimensions of the docshell
|
|
|
+ nsIntRect mBounds;
|
|
|
+- nsString mName;
|
|
|
+- nsString mTitle;
|
|
|
+- nsString mCustomUserAgent;
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Content-Type Hint of the most-recently initiated load. Used for
|
|
|
+ * session history entries.
|
|
|
+ */
|
|
|
+ nsCString mContentTypeHint;
|
|
|
+- nsIntPoint mDefaultScrollbarPref; // persistent across doc loads
|
|
|
+
|
|
|
+- nsCOMPtr<nsIMutableArray> mRefreshURIList;
|
|
|
+- nsCOMPtr<nsIMutableArray> mSavedRefreshURIList;
|
|
|
+- RefPtr<nsDSURIContentListener> mContentListener;
|
|
|
+- nsCOMPtr<nsIContentViewer> mContentViewer;
|
|
|
+- nsCOMPtr<nsIWidget> mParentWidget;
|
|
|
++ // An observed docshell wrapper is created when recording markers is enabled.
|
|
|
++ mozilla::UniquePtr<mozilla::ObservedDocShell> mObserved;
|
|
|
+
|
|
|
+ // mCurrentURI should be marked immutable on set if possible.
|
|
|
+ nsCOMPtr<nsIURI> mCurrentURI;
|
|
|
+ nsCOMPtr<nsIURI> mReferrerURI;
|
|
|
+- uint32_t mReferrerPolicy;
|
|
|
+- RefPtr<nsGlobalWindow> mScriptGlobal;
|
|
|
+- nsCOMPtr<nsISHistory> mSessionHistory;
|
|
|
+- nsCOMPtr<nsIGlobalHistory2> mGlobalHistory;
|
|
|
+- nsCOMPtr<nsIWebBrowserFind> mFind;
|
|
|
+- nsCOMPtr<nsICommandManager> mCommandManager;
|
|
|
++
|
|
|
+ // Reference to the SHEntry for this docshell until the page is destroyed.
|
|
|
+ // Somebody give me better name
|
|
|
+ nsCOMPtr<nsISHEntry> mOSHE;
|
|
|
++
|
|
|
+ // Reference to the SHEntry for this docshell until the page is loaded
|
|
|
+ // Somebody give me better name.
|
|
|
+ // If mLSHE is non-null, non-pushState subframe loads don't create separate
|
|
|
+ // root history entries. That is, frames loaded during the parent page
|
|
|
+ // load don't generate history entries the way frame navigation after the
|
|
|
+ // parent has loaded does. (This isn't the only purpose of mLSHE.)
|
|
|
+ nsCOMPtr<nsISHEntry> mLSHE;
|
|
|
+
|
|
|
+@@ -975,64 +1036,107 @@ protected:
|
|
|
+
|
|
|
+ // The URI we're currently loading. This is only relevant during the
|
|
|
+ // firing of a pagehide/unload. The caller of FirePageHideNotification()
|
|
|
+ // is responsible for setting it and unsetting it. It may be null if the
|
|
|
+ // pagehide/unload is happening for some reason other than just loading a
|
|
|
+ // new URI.
|
|
|
+ nsCOMPtr<nsIURI> mLoadingURI;
|
|
|
+
|
|
|
++ // Our list of ancestor principals.
|
|
|
++ nsTArray<nsCOMPtr<nsIPrincipal>> mAncestorPrincipals;
|
|
|
++
|
|
|
++ // Our list of ancestor outerWindowIDs.
|
|
|
++ nsTArray<uint64_t> mAncestorOuterWindowIDs;
|
|
|
++
|
|
|
+ // Set in LoadErrorPage from the method argument and used later
|
|
|
+ // in CreateContentViewer. We have to delay an shistory entry creation
|
|
|
+ // for which these objects are needed.
|
|
|
+ nsCOMPtr<nsIURI> mFailedURI;
|
|
|
+ nsCOMPtr<nsIChannel> mFailedChannel;
|
|
|
+- uint32_t mFailedLoadType;
|
|
|
+
|
|
|
+ // Set in DoURILoad when either the LOAD_RELOAD_ALLOW_MIXED_CONTENT flag or
|
|
|
+ // the LOAD_NORMAL_ALLOW_MIXED_CONTENT flag is set.
|
|
|
+ // Checked in nsMixedContentBlocker, to see if the channels match.
|
|
|
+ nsCOMPtr<nsIChannel> mMixedContentChannel;
|
|
|
+
|
|
|
++ const mozilla::Encoding* mForcedCharset;
|
|
|
++ const mozilla::Encoding* mParentCharset;
|
|
|
++
|
|
|
+ // WEAK REFERENCES BELOW HERE.
|
|
|
+ // Note these are intentionally not addrefd. Doing so will create a cycle.
|
|
|
+ // For that reasons don't use nsCOMPtr.
|
|
|
+
|
|
|
+- nsIDocShellTreeOwner* mTreeOwner; // Weak Reference
|
|
|
++ nsIDocShellTreeOwner* mTreeOwner; // Weak Reference
|
|
|
+
|
|
|
+ nsCOMPtr<mozilla::dom::EventTarget> mChromeEventHandler;
|
|
|
+
|
|
|
++ nsIntPoint mDefaultScrollbarPref; // persistent across doc loads
|
|
|
++
|
|
|
+ eCharsetReloadState mCharsetReloadState;
|
|
|
+
|
|
|
+- // Offset in the parent's child list.
|
|
|
+- // -1 if the docshell is added dynamically to the parent shell.
|
|
|
+- int32_t mChildOffset;
|
|
|
+- uint32_t mBusyFlags;
|
|
|
+- uint32_t mAppType;
|
|
|
+- uint32_t mLoadType;
|
|
|
++ // The orientation lock as described by
|
|
|
++ // https://w3c.github.io/screen-orientation/
|
|
|
++ mozilla::dom::ScreenOrientationInternal mOrientationLock;
|
|
|
+
|
|
|
++ int32_t mParentCharsetSource;
|
|
|
+ int32_t mMarginWidth;
|
|
|
+ int32_t mMarginHeight;
|
|
|
+
|
|
|
+ // This can either be a content docshell or a chrome docshell. After
|
|
|
+ // Create() is called, the type is not expected to change.
|
|
|
+ int32_t mItemType;
|
|
|
+
|
|
|
+ // Index into the SHTransaction list, indicating the previous and current
|
|
|
+ // transaction at the time that this DocShell begins to load. Consequently
|
|
|
+ // root docshell's indices can differ from child docshells'.
|
|
|
+ int32_t mPreviousTransIndex;
|
|
|
+ int32_t mLoadedTransIndex;
|
|
|
+
|
|
|
++ // Offset in the parent's child list.
|
|
|
++ // -1 if the docshell is added dynamically to the parent shell.
|
|
|
++ int32_t mChildOffset;
|
|
|
++
|
|
|
+ uint32_t mSandboxFlags;
|
|
|
+- nsWeakPtr mOnePermittedSandboxedNavigator;
|
|
|
++ uint32_t mBusyFlags;
|
|
|
++ uint32_t mAppType;
|
|
|
++ uint32_t mLoadType;
|
|
|
++ uint32_t mDefaultLoadFlags;
|
|
|
++ uint32_t mReferrerPolicy;
|
|
|
++ uint32_t mFailedLoadType;
|
|
|
++
|
|
|
++ // Are we a regular frame, a browser frame, or an app frame?
|
|
|
++ uint32_t mFrameType;
|
|
|
+
|
|
|
+- // The orientation lock as described by
|
|
|
+- // https://w3c.github.io/screen-orientation/
|
|
|
+- mozilla::dom::ScreenOrientationInternal mOrientationLock;
|
|
|
++ // This represents the state of private browsing in the docshell.
|
|
|
++ // Currently treated as a binary value: 1 - in private mode, 0 - not private mode
|
|
|
++ // On content docshells mPrivateBrowsingId == mOriginAttributes.mPrivateBrowsingId
|
|
|
++ // On chrome docshells this value will be set, but not have the corresponding
|
|
|
++ // origin attribute set.
|
|
|
++ uint32_t mPrivateBrowsingId;
|
|
|
++
|
|
|
++ // This represents the CSS display-mode we are currently using.
|
|
|
++ // It can be any of the following values from nsIDocShell.idl:
|
|
|
++ //
|
|
|
++ // DISPLAY_MODE_BROWSER = 0
|
|
|
++ // DISPLAY_MODE_MINIMAL_UI = 1
|
|
|
++ // DISPLAY_MODE_STANDALONE = 2
|
|
|
++ // DISPLAY_MODE_FULLSCREEN = 3
|
|
|
++ //
|
|
|
++ // This is mostly used for media queries. The integer values above
|
|
|
++ // match those used in nsStyleConsts.h
|
|
|
++ uint32_t mDisplayMode;
|
|
|
++
|
|
|
++ // A depth count of how many times NotifyRunToCompletionStart
|
|
|
++ // has been called without a matching NotifyRunToCompletionStop.
|
|
|
++ uint32_t mJSRunToCompletionDepth;
|
|
|
++
|
|
|
++ // Whether or not touch events are overridden. Possible values are defined
|
|
|
++ // as constants in the nsIDocShell.idl file.
|
|
|
++ uint32_t mTouchEventsOverride;
|
|
|
+
|
|
|
+ // mFullscreenAllowed stores how we determine whether fullscreen is allowed
|
|
|
+ // when GetFullscreenAllowed() is called. Fullscreen is allowed in a
|
|
|
+ // docshell when all containing iframes have the allowfullscreen
|
|
|
+ // attribute set to true. When mFullscreenAllowed is CHECK_ATTRIBUTES
|
|
|
+ // we check this docshell's containing frame for the allowfullscreen
|
|
|
+ // attribute, and recurse onto the parent docshell to ensure all containing
|
|
|
+ // frames also have the allowfullscreen attribute. If we find an ancestor
|
|
|
+@@ -1044,18 +1148,22 @@ protected:
|
|
|
+ enum FullscreenAllowedState : uint8_t
|
|
|
+ {
|
|
|
+ CHECK_ATTRIBUTES,
|
|
|
+ PARENT_ALLOWS,
|
|
|
+ PARENT_PROHIBITS
|
|
|
+ };
|
|
|
+ FullscreenAllowedState mFullscreenAllowed;
|
|
|
+
|
|
|
+- // Cached value of the "browser.xul.error_pages.enabled" preference.
|
|
|
+- static bool sUseErrorPages;
|
|
|
++ // The following two fields cannot be declared as bit fields
|
|
|
++ // because of uses with AutoRestore.
|
|
|
++ bool mCreatingDocument; // (should be) debugging only
|
|
|
++#ifdef DEBUG
|
|
|
++ bool mInEnsureScriptEnv;
|
|
|
++#endif
|
|
|
+
|
|
|
+ bool mCreated : 1;
|
|
|
+ bool mAllowSubframes : 1;
|
|
|
+ bool mAllowPlugins : 1;
|
|
|
+ bool mAllowJavascript : 1;
|
|
|
+ bool mAllowMetaRedirects : 1;
|
|
|
+ bool mAllowImages : 1;
|
|
|
+ bool mAllowMedia : 1;
|
|
|
+@@ -1078,17 +1186,16 @@ protected:
|
|
|
+ bool mWindowDraggingAllowed : 1;
|
|
|
+ bool mInFrameSwap : 1;
|
|
|
+ bool mInheritPrivateBrowsingId : 1;
|
|
|
+
|
|
|
+ // Because scriptability depends on the mAllowJavascript values of our
|
|
|
+ // ancestors, we cache the effective scriptability and recompute it when
|
|
|
+ // it might have changed;
|
|
|
+ bool mCanExecuteScripts : 1;
|
|
|
+- void RecomputeCanExecuteScripts();
|
|
|
+
|
|
|
+ // This boolean is set to true right before we fire pagehide and generally
|
|
|
+ // unset when we embed a new content viewer. While it's true no navigation
|
|
|
+ // is allowed in this docshell.
|
|
|
+ bool mFiredUnloadEvent : 1;
|
|
|
+
|
|
|
+ // this flag is for bug #21358. a docshell may load many urls
|
|
|
+ // which don't result in new documents being created (i.e. a new
|
|
|
+@@ -1114,120 +1221,11 @@ protected:
|
|
|
+ bool mAffectPrivateSessionLifetime : 1;
|
|
|
+ bool mInvisible : 1;
|
|
|
+ bool mHasLoadedNonBlankURI : 1;
|
|
|
+
|
|
|
+ // This flag means that mTiming has been initialized but nulled out.
|
|
|
+ // We will check the innerWin's timing before creating a new one
|
|
|
+ // in MaybeInitTiming()
|
|
|
+ bool mBlankTiming : 1;
|
|
|
+-
|
|
|
+- // The following two fields cannot be declared as bit fields
|
|
|
+- // because of uses with AutoRestore.
|
|
|
+- bool mCreatingDocument; // (should be) debugging only
|
|
|
+-#ifdef DEBUG
|
|
|
+- bool mInEnsureScriptEnv;
|
|
|
+-#endif
|
|
|
+-
|
|
|
+- nsID mHistoryID;
|
|
|
+- uint32_t mDefaultLoadFlags;
|
|
|
+-
|
|
|
+- static nsIURIFixup* sURIFixup;
|
|
|
+-
|
|
|
+- RefPtr<nsDOMNavigationTiming> mTiming;
|
|
|
+-
|
|
|
+- // Are we a regular frame, a browser frame, or an app frame?
|
|
|
+- uint32_t mFrameType;
|
|
|
+-
|
|
|
+- // This represents the state of private browsing in the docshell.
|
|
|
+- // Currently treated as a binary value: 1 - in private mode, 0 - not private mode
|
|
|
+- // On content docshells mPrivateBrowsingId == mOriginAttributes.mPrivateBrowsingId
|
|
|
+- // On chrome docshells this value will be set, but not have the corresponding
|
|
|
+- // origin attribute set.
|
|
|
+- uint32_t mPrivateBrowsingId;
|
|
|
+-
|
|
|
+- // This represents the CSS display-mode we are currently using.
|
|
|
+- // It can be any of the following values from nsIDocShell.idl:
|
|
|
+- //
|
|
|
+- // DISPLAY_MODE_BROWSER = 0
|
|
|
+- // DISPLAY_MODE_MINIMAL_UI = 1
|
|
|
+- // DISPLAY_MODE_STANDALONE = 2
|
|
|
+- // DISPLAY_MODE_FULLSCREEN = 3
|
|
|
+- //
|
|
|
+- // This is mostly used for media queries. The integer values above
|
|
|
+- // match those used in nsStyleConsts.h
|
|
|
+- uint32_t mDisplayMode;
|
|
|
+-
|
|
|
+-private:
|
|
|
+- const Encoding* mForcedCharset;
|
|
|
+- const Encoding* mParentCharset;
|
|
|
+- int32_t mParentCharsetSource;
|
|
|
+- nsCOMPtr<nsIPrincipal> mParentCharsetPrincipal;
|
|
|
+- nsTObserverArray<nsWeakPtr> mPrivacyObservers;
|
|
|
+- nsTObserverArray<nsWeakPtr> mReflowObservers;
|
|
|
+- nsTObserverArray<nsWeakPtr> mScrollObservers;
|
|
|
+- nsCString mOriginalUriString;
|
|
|
+- nsWeakPtr mOpener;
|
|
|
+- mozilla::OriginAttributes mOriginAttributes;
|
|
|
+-
|
|
|
+- mozilla::UniquePtr<mozilla::dom::ClientSource> mInitialClientSource;
|
|
|
+-
|
|
|
+- // A depth count of how many times NotifyRunToCompletionStart
|
|
|
+- // has been called without a matching NotifyRunToCompletionStop.
|
|
|
+- uint32_t mJSRunToCompletionDepth;
|
|
|
+-
|
|
|
+- // Whether or not touch events are overridden. Possible values are defined
|
|
|
+- // as constants in the nsIDocShell.idl file.
|
|
|
+- uint32_t mTouchEventsOverride;
|
|
|
+-
|
|
|
+- // Our list of ancestor principals.
|
|
|
+- nsTArray<nsCOMPtr<nsIPrincipal>> mAncestorPrincipals;
|
|
|
+- // Our list of ancestor outerWindowIDs.
|
|
|
+- nsTArray<uint64_t> mAncestorOuterWindowIDs;
|
|
|
+-
|
|
|
+- // Separate function to do the actual name (i.e. not _top, _self etc.)
|
|
|
+- // searching for FindItemWithName.
|
|
|
+- nsresult DoFindItemWithName(const nsAString& aName,
|
|
|
+- nsIDocShellTreeItem* aRequestor,
|
|
|
+- nsIDocShellTreeItem* aOriginalRequestor,
|
|
|
+- bool aSkipTabGroup,
|
|
|
+- nsIDocShellTreeItem** aResult);
|
|
|
+-
|
|
|
+- // Helper assertion to enforce that mInPrivateBrowsing is in sync with
|
|
|
+- // OriginAttributes.mPrivateBrowsingId
|
|
|
+- void AssertOriginAttributesMatchPrivateBrowsing();
|
|
|
+-
|
|
|
+- // Notify consumers of a search being loaded through the observer service:
|
|
|
+- void MaybeNotifyKeywordSearchLoading(const nsString& aProvider,
|
|
|
+- const nsString& aKeyword);
|
|
|
+-
|
|
|
+- // Internal implementation of nsIDocShell::FirePageHideNotification.
|
|
|
+- // If aSkipCheckingDynEntries is true, it will not try to remove dynamic
|
|
|
+- // subframe entries. This is to avoid redundant RemoveDynEntries calls in all
|
|
|
+- // children docshells.
|
|
|
+- void FirePageHideNotificationInternal(bool aIsUnload,
|
|
|
+- bool aSkipCheckingDynEntries);
|
|
|
+-
|
|
|
+- // Dispatch a runnable to the TabGroup associated to this docshell.
|
|
|
+- nsresult DispatchToTabGroup(mozilla::TaskCategory aCategory,
|
|
|
+- already_AddRefed<nsIRunnable>&& aRunnable);
|
|
|
+-
|
|
|
+-#ifdef DEBUG
|
|
|
+- // We're counting the number of |nsDocShells| to help find leaks
|
|
|
+- static unsigned long gNumberOfDocShells;
|
|
|
+-#endif /* DEBUG */
|
|
|
+-
|
|
|
+-public:
|
|
|
+- class InterfaceRequestorProxy : public nsIInterfaceRequestor
|
|
|
+- {
|
|
|
+- public:
|
|
|
+- explicit InterfaceRequestorProxy(nsIInterfaceRequestor* aRequestor);
|
|
|
+- NS_DECL_THREADSAFE_ISUPPORTS
|
|
|
+- NS_DECL_NSIINTERFACEREQUESTOR
|
|
|
+-
|
|
|
+- protected:
|
|
|
+- virtual ~InterfaceRequestorProxy();
|
|
|
+- InterfaceRequestorProxy() {}
|
|
|
+- nsWeakPtr mWeakPtr;
|
|
|
+- };
|
|
|
+ };
|
|
|
+
|
|
|
+ #endif /* nsDocShell_h__ */
|
Ian Neal