Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(181)

Unified Diff: third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp

Issue 2737553007: Duplicate WindowProxy::disposeContext() into subclasses. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp b/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
index 831e87122f5d88271c64e2239042169cf5987241..efad7d6a828fab92d52b9714bba693e4a4a80078 100644
--- a/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
@@ -37,6 +37,7 @@
#include "bindings/core/v8/V8Binding.h"
#include "bindings/core/v8/V8DOMActivityLogger.h"
#include "bindings/core/v8/V8DOMWrapper.h"
+#include "bindings/core/v8/V8GCForContextDispose.h"
#include "bindings/core/v8/V8HTMLDocument.h"
#include "bindings/core/v8/V8HiddenValue.h"
#include "bindings/core/v8/V8Initializer.h"
@@ -77,7 +78,32 @@ void LocalWindowProxy::disposeContext(GlobalDetachmentBehavior behavior) {
m_world->worldId());
MainThreadDebugger::instance()->contextWillBeDestroyed(m_scriptState.get());
- WindowProxy::disposeContext(behavior);
+ if (behavior == DetachGlobal) {
+ v8::Local<v8::Context> context = m_scriptState->context();
+ // Clean up state on the global proxy, which will be reused.
+ if (!m_globalProxy.isEmpty()) {
+ // TODO(yukishiino): This DCHECK failed on Canary (M57) and Dev (M56).
+ // We need to figure out why m_globalProxy != context->Global().
+ DCHECK(m_globalProxy == context->Global());
+ DCHECK_EQ(toScriptWrappable(context->Global()),
+ toScriptWrappable(
+ context->Global()->GetPrototype().As<v8::Object>()));
+ m_globalProxy.get().SetWrapperClassId(0);
+ }
+ V8DOMWrapper::clearNativeInfo(isolate(), context->Global());
haraken 2017/03/08 06:21:37 Is your crash related to the fact that we're expli
dcheng 2017/03/08 06:46:40 It's unclear. In theory, we shouldn't clear the in
+ m_scriptState->detachGlobalObject();
+ }
+
+ m_scriptState->disposePerContextData();
+
+ // It's likely that disposing the context has created a lot of
+ // garbage. Notify V8 about this so it'll have a chance of cleaning
+ // it up when idle.
+ V8GCForContextDispose::instance().notifyContextDisposed(
+ frame()->isMainFrame());
+
+ DCHECK(m_lifecycle == Lifecycle::ContextInitialized);
+ m_lifecycle = Lifecycle::ContextDetached;
}
void LocalWindowProxy::initialize() {

Powered by Google App Engine
This is Rietveld 408576698