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

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

Issue 2721693002: Revert of Switch RemoteWindowProxy to use v8::Context::NewRemoteContext. (Closed)
Patch Set: Created 3 years, 10 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 0720f8d775e289a1bf6ed8ac038f93bed6a0f646..088ceb751c452441980f37aa5b10ba6b57d042f6 100644
--- a/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
@@ -37,11 +37,9 @@
#include "bindings/core/v8/ToV8.h"
#include "bindings/core/v8/V8Binding.h"
#include "bindings/core/v8/V8DOMActivityLogger.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"
-#include "bindings/core/v8/V8PagePopupControllerBinding.h"
#include "bindings/core/v8/V8PrivateProperty.h"
#include "bindings/core/v8/V8Window.h"
#include "core/dom/Modulator.h"
@@ -59,7 +57,6 @@
#include "platform/heap/Handle.h"
#include "platform/instrumentation/tracing/TraceEvent.h"
#include "platform/weborigin/SecurityOrigin.h"
-#include "v8/include/v8.h"
#include "wtf/Assertions.h"
namespace blink {
@@ -77,36 +74,7 @@
m_world->worldId());
MainThreadDebugger::instance()->contextWillBeDestroyed(m_scriptState.get());
- 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());
- m_scriptState->detachGlobalObject();
-
-#if DCHECK_IS_ON()
- didDetachGlobalProxy();
-#endif
- }
-
- 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;
+ WindowProxy::disposeContext(behavior);
}
void LocalWindowProxy::initialize() {
@@ -162,54 +130,12 @@
frame()->loader().dispatchDidClearWindowObjectInMainWorld();
}
-void LocalWindowProxy::setupWindowPrototypeChain() {
- // Associate the window wrapper object and its prototype chain with the
- // corresponding native DOMWindow object.
- LocalDOMWindow* window = frame()->domWindow();
- const WrapperTypeInfo* wrapperTypeInfo = window->wrapperTypeInfo();
- v8::Local<v8::Context> context = m_scriptState->context();
-
- // The global proxy object. Note this is not the global object.
- v8::Local<v8::Object> globalProxy = context->Global();
- CHECK(m_globalProxy == globalProxy);
- V8DOMWrapper::setNativeInfo(isolate(), globalProxy, wrapperTypeInfo, window);
- // Mark the handle to be traced by Oilpan, since the global proxy has a
- // reference to the DOMWindow.
- m_globalProxy.get().SetWrapperClassId(wrapperTypeInfo->wrapperClassId);
-
-#if DCHECK_IS_ON()
- didAttachGlobalProxy();
-#endif
-
- // The global object, aka window wrapper object.
- v8::Local<v8::Object> windowWrapper =
- globalProxy->GetPrototype().As<v8::Object>();
- V8DOMWrapper::setNativeInfo(isolate(), windowWrapper, wrapperTypeInfo,
- window);
-
- // The prototype object of Window interface.
- v8::Local<v8::Object> windowPrototype =
- windowWrapper->GetPrototype().As<v8::Object>();
- CHECK(!windowPrototype.IsEmpty());
- V8DOMWrapper::setNativeInfo(isolate(), windowPrototype, wrapperTypeInfo,
- window);
-
- // The named properties object of Window interface.
- v8::Local<v8::Object> windowProperties =
- windowPrototype->GetPrototype().As<v8::Object>();
- CHECK(!windowProperties.IsEmpty());
- V8DOMWrapper::setNativeInfo(isolate(), windowProperties, wrapperTypeInfo,
- window);
-
- // TODO(keishi): Remove installPagePopupController and implement
- // PagePopupController in another way.
- V8PagePopupControllerBinding::installPagePopupController(context,
- windowWrapper);
-}
-
void LocalWindowProxy::createContext() {
// Create a new v8::Context with the window object as the global object
- // (aka the inner global). Reuse the outer global proxy if it already exists.
+ // (aka the inner global). Reuse the global proxy object (aka the outer
+ // global) if it already exists. See the comments in
+ // setupWindowPrototypeChain for the structure of the prototype chain of
+ // the global object.
v8::Local<v8::ObjectTemplate> globalTemplate =
V8Window::domTemplate(isolate(), *m_world)->InstanceTemplate();
CHECK(!globalTemplate.IsEmpty());

Powered by Google App Engine
This is Rietveld 408576698