summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-12-23 00:00:23 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-12-23 00:00:23 +0100
commitb1c7cc07c093c795cbc01c8eb43b355ea81435e4 (patch)
tree57bb980b5902c901bc0031209d66ffd7530929e9
parentf71108680b30848e48e0a1f7a6cef7fa37ec46b1 (diff)
downloadUXP-b1c7cc07c093c795cbc01c8eb43b355ea81435e4.tar
UXP-b1c7cc07c093c795cbc01c8eb43b355ea81435e4.tar.gz
UXP-b1c7cc07c093c795cbc01c8eb43b355ea81435e4.tar.lz
UXP-b1c7cc07c093c795cbc01c8eb43b355ea81435e4.tar.xz
UXP-b1c7cc07c093c795cbc01c8eb43b355ea81435e4.zip
Issue #1118 - Part 7: Remove no-longer-used mWillReparent debug code.
-rw-r--r--dom/base/nsDocument.cpp12
-rw-r--r--dom/base/nsDocument.h5
2 files changed, 0 insertions, 17 deletions
diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp
index 0f663636f..afe88a454 100644
--- a/dom/base/nsDocument.cpp
+++ b/dom/base/nsDocument.cpp
@@ -4512,18 +4512,6 @@ nsDocument::SetScriptGlobalObject(nsIScriptGlobalObject *aScriptGlobalObject)
mLayoutHistoryState = nullptr;
SetScopeObject(aScriptGlobalObject);
mHasHadDefaultView = true;
-#ifdef DEBUG
- if (!mWillReparent) {
- // We really shouldn't have a wrapper here but if we do we need to make sure
- // it has the correct parent.
- JSObject *obj = GetWrapperPreserveColor();
- if (obj) {
- JSObject *newScope = aScriptGlobalObject->GetGlobalJSObject();
- NS_ASSERTION(js::GetGlobalForObjectCrossCompartment(obj) == newScope,
- "Wrong scope, this is really bad!");
- }
- }
-#endif
if (mAllowDNSPrefetch) {
nsCOMPtr<nsIDocShell> docShell(mDocumentContainer);
diff --git a/dom/base/nsDocument.h b/dom/base/nsDocument.h
index c2b1d3cdb..8ea4993f0 100644
--- a/dom/base/nsDocument.h
+++ b/dom/base/nsDocument.h
@@ -1646,11 +1646,6 @@ private:
// Set to true when the document is possibly controlled by the ServiceWorker.
// Used to prevent multiple requests to ServiceWorkerManager.
bool mMaybeServiceWorkerControlled;
-
-#ifdef DEBUG
-public:
- bool mWillReparent;
-#endif
};
class nsDocumentOnStack