Bug 1653214 - Part 1: Merge implementations of nsDocShell::Create into nsDocShell::InitWindow; r=nika

Differential Revision: https://phabricator.services.mozilla.com/D83766
This commit is contained in:
Edgar Chen
2020-07-16 20:42:02 +00:00
parent 6418ca2775
commit 3e6487ae46
5 changed files with 44 additions and 43 deletions

View File

@@ -194,11 +194,13 @@ class nsDocShell final : public nsDocLoader,
NS_DECL_NSINETWORKINTERCEPTCONTROLLER
NS_DECL_NSIDEPRECATIONWARNER
// Create a new nsDocShell object, initializing it.
// Create a new nsDocShell object.
static already_AddRefed<nsDocShell> Create(
mozilla::dom::BrowsingContext* aBrowsingContext,
uint64_t aContentWindowID = 0);
bool Initialize();
NS_IMETHOD Stop() override {
// Need this here because otherwise nsIWebNavigation::Stop
// overrides the docloader's Stop()
@@ -1186,7 +1188,7 @@ class nsDocShell final : public nsDocLoader,
bool mInEnsureScriptEnv;
#endif
bool mCreated : 1;
bool mInitialized : 1;
bool mAllowSubframes : 1;
bool mAllowJavascript : 1;
bool mAllowMetaRedirects : 1;