Index: third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.cpp |
diff --git a/third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.cpp b/third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.cpp |
index eaa8bbed0d4daa7644a1b8d855b4a080be487b87..13435fb7f89dde77d2853c4aa920bafabef3eb22 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.cpp |
+++ b/third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.cpp |
@@ -33,12 +33,9 @@ |
#include <utility> |
#include "bindings/core/v8/DOMWrapperWorld.h" |
-#include "bindings/core/v8/V8GCForContextDispose.h" |
+#include "bindings/core/v8/V8DOMWrapper.h" |
#include "bindings/core/v8/V8Window.h" |
#include "platform/Histogram.h" |
-#include "platform/RuntimeEnabledFeatures.h" |
-#include "platform/ScriptForbiddenScope.h" |
-#include "platform/heap/Handle.h" |
#include "platform/instrumentation/tracing/TraceEvent.h" |
#include "v8/include/v8.h" |
#include "wtf/Assertions.h" |
@@ -54,35 +51,15 @@ void RemoteWindowProxy::disposeContext(GlobalDetachmentBehavior behavior) { |
if (m_lifecycle != Lifecycle::ContextInitialized) |
return; |
- 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 (behavior == DetachGlobal && !m_globalProxy.isEmpty()) { |
+ m_globalProxy.get().SetWrapperClassId(0); |
+ V8DOMWrapper::clearNativeInfo(isolate(), m_globalProxy.newLocal(isolate())); |
#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); |
+ DCHECK_EQ(Lifecycle::ContextInitialized, m_lifecycle); |
m_lifecycle = Lifecycle::ContextDetached; |
} |
@@ -93,35 +70,18 @@ void RemoteWindowProxy::initialize() { |
frame()->isMainFrame() ? "Blink.Binding.InitializeMainWindowProxy" |
: "Blink.Binding.InitializeNonMainWindowProxy"); |
- ScriptForbiddenScope::AllowUserAgentScript allowScript; |
- |
v8::HandleScope handleScope(isolate()); |
createContext(); |
- ScriptState::Scope scope(m_scriptState.get()); |
- v8::Local<v8::Context> context = m_scriptState->context(); |
- if (m_globalProxy.isEmpty()) { |
- m_globalProxy.set(isolate(), context->Global()); |
- CHECK(!m_globalProxy.isEmpty()); |
- } |
- |
setupWindowPrototypeChain(); |
- |
- // Remote frames always require a full canAccess() check. |
- context->UseDefaultSecurityToken(); |
} |
void RemoteWindowProxy::setupWindowPrototypeChain() { |
- // Associate the window wrapper object and its prototype chain with the |
- // corresponding native DOMWindow object. |
DOMWindow* 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); |
+ v8::Local<v8::Object> globalProxy = m_globalProxy.newLocal(isolate()); |
V8DOMWrapper::setNativeInfo(isolate(), globalProxy, wrapperTypeInfo, window); |
// Mark the handle to be traced by Oilpan, since the global proxy has a |
// reference to the DOMWindow. |
@@ -136,20 +96,6 @@ void RemoteWindowProxy::setupWindowPrototypeChain() { |
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); |
} |
void RemoteWindowProxy::createContext() { |
@@ -159,22 +105,20 @@ void RemoteWindowProxy::createContext() { |
V8Window::domTemplate(isolate(), *m_world)->InstanceTemplate(); |
CHECK(!globalTemplate.IsEmpty()); |
- v8::Local<v8::Context> context; |
- { |
- V8PerIsolateData::UseCounterDisabledScope useCounterDisabled( |
- V8PerIsolateData::from(isolate())); |
- context = v8::Context::New(isolate(), nullptr, globalTemplate, |
- m_globalProxy.newLocal(isolate())); |
- } |
- CHECK(!context.IsEmpty()); |
- |
- m_scriptState = ScriptState::create(context, m_world); |
+ v8::Local<v8::Object> globalProxy = |
+ v8::Context::NewRemoteContext(isolate(), globalTemplate, |
+ m_globalProxy.newLocal(isolate())) |
+ .ToLocalChecked(); |
+ if (m_globalProxy.isEmpty()) |
+ m_globalProxy.set(isolate(), globalProxy); |
+ else |
+ DCHECK(m_globalProxy.get() == globalProxy); |
+ CHECK(!m_globalProxy.isEmpty()); |
// TODO(haraken): Currently we cannot enable the following DCHECK because |
// an already detached window proxy can be re-initialized. This is wrong. |
// DCHECK(m_lifecycle == Lifecycle::ContextUninitialized); |
m_lifecycle = Lifecycle::ContextInitialized; |
- DCHECK(m_scriptState->contextIsValid()); |
} |
} // namespace blink |