Refactor WindowProxy into Local and Remote subclasses.

third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp

Index: third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp b/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
similarity index 46%
copy from third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp
copy to third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
index 61471d3f5b944ef41bf07347bc90f7bb30894ebc..433e73dcdf3600589f00f183fc89c4380cc85070 100644
--- a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
@@ -28,7 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "bindings/core/v8/WindowProxy.h"
+#include "bindings/core/v8/LocalWindowProxy.h"
 
 #include "bindings/core/v8/ConditionalFeatures.h"
 #include "bindings/core/v8/DOMWrapperWorld.h"
@@ -36,24 +36,16 @@
 #include "bindings/core/v8/ToV8.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8DOMActivityLogger.h"
-#include "bindings/core/v8/V8Document.h"
-#include "bindings/core/v8/V8GCForContextDispose.h"
-#include "bindings/core/v8/V8HTMLCollection.h"
 #include "bindings/core/v8/V8HTMLDocument.h"
 #include "bindings/core/v8/V8HiddenValue.h"
 #include "bindings/core/v8/V8Initializer.h"
-#include "bindings/core/v8/V8ObjectConstructor.h"
-#include "bindings/core/v8/V8PagePopupControllerBinding.h"
 #include "bindings/core/v8/V8PrivateProperty.h"
 #include "bindings/core/v8/V8Window.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/html/DocumentNameCollection.h"
-#include "core/html/HTMLCollection.h"
 #include "core/html/HTMLIFrameElement.h"
-#include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/MainThreadDebugger.h"
-#include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/origin_trials/OriginTrialContext.h"
@@ -63,187 +55,50 @@
 #include "platform/heap/Handle.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "platform/weborigin/SecurityOrigin.h"
-#include "public/platform/Platform.h"
 #include "wtf/Assertions.h"
-#include "wtf/StringExtras.h"
-#include "wtf/text/CString.h"
-#include <algorithm>
-#include <utility>
-#include <v8-debug.h>
 #include <v8.h>
 
 namespace blink {
 
-WindowProxy* WindowProxy::create(v8::Isolate* isolate,
-                                 Frame* frame,
-                                 DOMWrapperWorld& world) {
-  return new WindowProxy(frame, &world, isolate);
-}
-
-WindowProxy::WindowProxy(Frame* frame,
-                         PassRefPtr<DOMWrapperWorld> world,
-                         v8::Isolate* isolate)
-    : m_frame(frame),
-      m_isolate(isolate),
-      m_world(world),
-      m_lifecycle(Lifecycle::ContextUninitialized) {}
-
-WindowProxy::~WindowProxy() {
+LocalWindowProxy::~LocalWindowProxy() {
   // clearForClose() or clearForNavigation() must be invoked before destruction
   // starts.
   DCHECK(m_lifecycle != Lifecycle::ContextInitialized);
 }
 
-DEFINE_TRACE(WindowProxy) {
-  visitor->trace(m_frame);
-}
-
-void WindowProxy::disposeContext(GlobalDetachmentBehavior behavior) {
+void LocalWindowProxy::disposeContext(GlobalDetachmentBehavior behavior) {
   if (m_lifecycle != Lifecycle::ContextInitialized)
     return;
 
   ScriptState::Scope scope(m_scriptState.get());
   v8::Local<v8::Context> context = m_scriptState->context();
-  if (m_frame->isLocalFrame()) {
-    LocalFrame* frame = toLocalFrame(m_frame);
-    // The embedder could run arbitrary code in response to the
-    // willReleaseScriptContext callback, so all disposing should happen after
-    // it returns.
-    frame->loader().client()->willReleaseScriptContext(context,
+  // The embedder could run arbitrary code in response to the
+  // willReleaseScriptContext callback, so all disposing should happen after
+  // it returns.
+  frame()->loader().client()->willReleaseScriptContext(context,
                                                        m_world->worldId());
-    MainThreadDebugger::instance()->contextWillBeDestroyed(m_scriptState.get());
-  }
-
-  if (behavior == DetachGlobal) {
-    // 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(m_isolate, context->Global());
-    m_scriptState->detachGlobalObject();
-  }
-
-  m_scriptState->disposePerContextData();
+  MainThreadDebugger::instance()->contextWillBeDestroyed(m_scriptState.get());
 
-  // 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(
-      m_frame->isMainFrame());
-
-  DCHECK(m_lifecycle == Lifecycle::ContextInitialized);
-  m_lifecycle = Lifecycle::ContextDetached;
-}
-
-void WindowProxy::clearForClose() {
-  disposeContext(DoNotDetachGlobal);
-}
-
-void WindowProxy::clearForNavigation() {
-  disposeContext(DetachGlobal);
+  WindowProxy::disposeContext(behavior);
 }
 
-v8::Local<v8::Object> WindowProxy::globalIfNotDetached() {
-  if (m_lifecycle == Lifecycle::ContextInitialized) {
-    DCHECK(m_scriptState->contextIsValid());
-    DCHECK(m_globalProxy == m_scriptState->context()->Global());
-    return m_globalProxy.newLocal(m_isolate);
-  }
-  return v8::Local<v8::Object>();
-}
-
-v8::Local<v8::Object> WindowProxy::releaseGlobal() {
-  DCHECK(m_lifecycle != Lifecycle::ContextInitialized);
-  // Make sure the global object was detached from the proxy by calling
-  // clearForNavigation().
-  if (m_lifecycle == Lifecycle::ContextDetached)
-    ASSERT(m_scriptState->isGlobalObjectDetached());
-
-  v8::Local<v8::Object> global = m_globalProxy.newLocal(m_isolate);
-  m_globalProxy.clear();
-  return global;
-}
-
-void WindowProxy::setGlobal(v8::Local<v8::Object> global) {
-  m_globalProxy.set(m_isolate, global);
-
-  // Initialize the window proxy now, to re-establish the connection between
-  // the global object and the v8::Context. This is really only needed for a
-  // RemoteDOMWindow, since it has no scripting environment of its own.
-  // Without this, existing script references to a swapped in RemoteDOMWindow
-  // would be broken until that RemoteDOMWindow was vended again through an
-  // interface like window.frames.
-  initializeIfNeeded();
-}
-
-// Create a new environment and setup the global object.
-//
-// The global object corresponds to a DOMWindow instance. However, to
-// allow properties of the JS DOMWindow instance to be shadowed, we
-// use a shadow object as the global object and use the JS DOMWindow
-// instance as the prototype for that shadow object. The JS DOMWindow
-// instance is undetectable from JavaScript code because the __proto__
-// accessors skip that object.
-//
-// The shadow object and the DOMWindow instance are seen as one object
-// from JavaScript. The JavaScript object that corresponds to a
-// DOMWindow instance is the shadow object. When mapping a DOMWindow
-// instance to a V8 object, we return the shadow object.
-//
-// To implement split-window, see
-//   1) https://bugs.webkit.org/show_bug.cgi?id=17249
-//   2) https://wiki.mozilla.org/Gecko:SplitWindow
-//   3) https://bugzilla.mozilla.org/show_bug.cgi?id=296639
-// we need to split the shadow object further into two objects:
-// an outer window and an inner window. The inner window is the hidden
-// prototype of the outer window. The inner window is the default
-// global object of the context. A variable declared in the global
-// scope is a property of the inner window.
-//
-// The outer window sticks to a LocalFrame, it is exposed to JavaScript
-// via window.window, window.self, window.parent, etc. The outer window
-// has a security token which is the domain. The outer window cannot
-// have its own properties. window.foo = 'x' is delegated to the
-// inner window.
-//
-// When a frame navigates to a new page, the inner window is cut off
-// the outer window, and the outer window identify is preserved for
-// the frame. However, a new inner window is created for the new page.
-// If there are JS code holds a closure to the old inner window,
-// it won't be able to reach the outer window via its global object.
-void WindowProxy::initializeIfNeeded() {
-  // TODO(haraken): It is wrong to re-initialize an already detached window
-  // proxy. This must be 'if(m_lifecycle == Lifecycle::ContextUninitialized)'.
-  if (m_lifecycle != Lifecycle::ContextInitialized) {
-    initialize();
-    if (m_world->isMainWorld() && m_frame->isLocalFrame())
-      toLocalFrame(m_frame)->loader().dispatchDidClearWindowObjectInMainWorld();
-  }
-}
-
-void WindowProxy::initialize() {
-  TRACE_EVENT1("v8", "WindowProxy::initialize", "isMainWindow",
-               m_frame->isMainFrame());
+void LocalWindowProxy::initialize() {
+  TRACE_EVENT1("v8", "LocalWindowProxy::initialize", "isMainWindow",
+               frame()->isMainFrame());
   SCOPED_BLINK_UMA_HISTOGRAM_TIMER(
-      m_frame->isMainFrame() ? "Blink.Binding.InitializeMainWindowProxy"
+      frame()->isMainFrame() ? "Blink.Binding.InitializeMainWindowProxy"
                              : "Blink.Binding.InitializeNonMainWindowProxy");
 
   ScriptForbiddenScope::AllowUserAgentScript allowScript;
 
-  v8::HandleScope handleScope(m_isolate);
+  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(m_isolate, context->Global());
+    m_globalProxy.set(isolate(), context->Global());
     CHECK(!m_globalProxy.isEmpty());
   }
 
@@ -253,62 +108,58 @@ void WindowProxy::initialize() {
   if (m_world->isMainWorld()) {
     // ActivityLogger for main world is updated within updateDocument().
     updateDocument();
-    origin = m_frame->securityContext()->getSecurityOrigin();
+    origin = frame()->document()->getSecurityOrigin();
     // FIXME: Can this be removed when CSP moves to browser?
-    ContentSecurityPolicy* csp =
-        m_frame->securityContext()->contentSecurityPolicy();
+    ContentSecurityPolicy* csp = frame()->document()->contentSecurityPolicy();
     context->AllowCodeGenerationFromStrings(
         csp->allowEval(0, ContentSecurityPolicy::SuppressReport));
     context->SetErrorMessageForCodeGenerationFromStrings(
-        v8String(m_isolate, csp->evalDisabledErrorMessage()));
+        v8String(isolate(), csp->evalDisabledErrorMessage()));
   } else {
     updateActivityLogger();
     origin = m_world->isolatedWorldSecurityOrigin();
     setSecurityToken(origin);
   }
 
-  if (m_frame->isLocalFrame()) {
-    LocalFrame* frame = toLocalFrame(m_frame);
-    MainThreadDebugger::instance()->contextCreated(m_scriptState.get(), frame,
-                                                   origin);
-    frame->loader().client()->didCreateScriptContext(
-        context, m_world->extensionGroup(), m_world->worldId());
-  }
+  MainThreadDebugger::instance()->contextCreated(m_scriptState.get(), frame(),
+                                                 origin);
+  frame()->loader().client()->didCreateScriptContext(
+      context, m_world->extensionGroup(), m_world->worldId());
   // If conditional features for window have been queued before the V8 context
   // was ready, then inject them into the context now
   if (m_world->isMainWorld()) {
     installPendingConditionalFeaturesOnWindow(m_scriptState.get());
   }
+
+  if (m_world->isMainWorld())
+    frame()->loader().dispatchDidClearWindowObjectInMainWorld();

[dcheng, 2017/01/11 08:35:16]

Moved from initializeIfNeeded(), since this logic only applies to local frames.

 }
 
-void WindowProxy::createContext() {
+void LocalWindowProxy::createContext() {
   // Create a new v8::Context with the window object as the global object
   // (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(m_isolate, *m_world)->InstanceTemplate();
+      V8Window::domTemplate(isolate(), *m_world)->InstanceTemplate();
   CHECK(!globalTemplate.IsEmpty());
 
   // FIXME: It's not clear what the right thing to do for remote frames is.
   // The extensions registered don't generally seem to make sense for remote
   // frames, so skip it for now.
   Vector<const char*> extensionNames;
-  if (m_frame->isLocalFrame()) {
-    LocalFrame* frame = toLocalFrame(m_frame);
-    // Dynamically tell v8 about our extensions now.
-    const V8Extensions& extensions = ScriptController::registeredExtensions();
-    extensionNames.reserveInitialCapacity(extensions.size());
-    int extensionGroup = m_world->extensionGroup();
-    int worldId = m_world->worldId();
-    for (const auto* extension : extensions) {
-      if (!frame->loader().client()->allowScriptExtension(
-              extension->name(), extensionGroup, worldId))
-        continue;
-
-      extensionNames.push_back(extension->name());
-    }
+  // Dynamically tell v8 about our extensions now.
+  const V8Extensions& extensions = ScriptController::registeredExtensions();
+  extensionNames.reserveInitialCapacity(extensions.size());
+  int extensionGroup = m_world->extensionGroup();
+  int worldId = m_world->worldId();
+  for (const auto* extension : extensions) {
+    if (!frame()->loader().client()->allowScriptExtension(
+            extension->name(), extensionGroup, worldId))
+      continue;
+
+    extensionNames.push_back(extension->name());
   }
   v8::ExtensionConfiguration extensionConfiguration(extensionNames.size(),
                                                     extensionNames.data());
@@ -316,10 +167,10 @@ void WindowProxy::createContext() {
   v8::Local<v8::Context> context;
   {
     V8PerIsolateData::UseCounterDisabledScope useCounterDisabled(
-        V8PerIsolateData::from(m_isolate));
+        V8PerIsolateData::from(isolate()));
     context =
-        v8::Context::New(m_isolate, &extensionConfiguration, globalTemplate,
-                         m_globalProxy.newLocal(m_isolate));
+        v8::Context::New(isolate(), &extensionConfiguration, globalTemplate,
+                         m_globalProxy.newLocal(isolate()));
   }
   CHECK(!context.IsEmpty());
 
@@ -332,110 +183,34 @@ void WindowProxy::createContext() {
   DCHECK(m_scriptState->contextIsValid());
 }
 
-void WindowProxy::setupWindowPrototypeChain() {
-  // Associate the window wrapper object and its prototype chain with the
-  // corresponding native DOMWindow object.
-  // The full structure of the global object's prototype chain is as follows:
-  //
-  // global proxy object [1]
-  //   -- has prototype --> global object (window wrapper object) [2]
-  //   -- has prototype --> Window.prototype
-  //   -- has prototype --> WindowProperties [3]
-  //   -- has prototype --> EventTarget.prototype
-  //   -- has prototype --> Object.prototype
-  //   -- has prototype --> null
-  //
-  // [1] Global proxy object is as known as "outer global object".  It's an
-  //   empty object and remains after navigation.  When navigated, points to
-  //   a different global object as the prototype object.
-  // [2] Global object is as known as "inner global object" or "window wrapper
-  //   object".  The prototype chain between global proxy object and global
-  //   object is NOT observable from user JavaScript code.  All other
-  //   prototype chains are observable.  Global proxy object and global object
-  //   together appear to be the same single JavaScript object.  See also:
-  //     https://wiki.mozilla.org/Gecko:SplitWindow
-  //   global object (= window wrapper object) provides most of Window's DOM
-  //   attributes and operations.  Also global variables defined by user
-  //   JavaScript are placed on this object.  When navigated, a new global
-  //   object is created together with a new v8::Context, but the global proxy
-  //   object doesn't change.
-  // [3] WindowProperties is a named properties object of Window interface.
-
-  DOMWindow* window = m_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(m_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);
-
-  // The global object, aka window wrapper object.
-  v8::Local<v8::Object> windowWrapper =
-      globalProxy->GetPrototype().As<v8::Object>();
-  windowWrapper = V8DOMWrapper::associateObjectWithWrapper(
-      m_isolate, window, wrapperTypeInfo, windowWrapper);
-
-  // The prototype object of Window interface.
-  v8::Local<v8::Object> windowPrototype =
-      windowWrapper->GetPrototype().As<v8::Object>();
-  CHECK(!windowPrototype.IsEmpty());
-  V8DOMWrapper::setNativeInfo(m_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(m_isolate, windowProperties, wrapperTypeInfo,
-                              window);
-
-  // TODO(keishi): Remove installPagePopupController and implement
-  // PagePopupController in another way.
-  V8PagePopupControllerBinding::installPagePopupController(context,
-                                                           windowWrapper);
-}
-
-void WindowProxy::updateDocumentProperty() {
+void LocalWindowProxy::updateDocumentProperty() {
   DCHECK(m_world->isMainWorld());
 
-  if (m_frame->isRemoteFrame())
-    return;
-
   ScriptState::Scope scope(m_scriptState.get());
   v8::Local<v8::Context> context = m_scriptState->context();
-  LocalFrame* frame = toLocalFrame(m_frame);
   v8::Local<v8::Value> documentWrapper =
-      ToV8(frame->document(), context->Global(), m_isolate);
+      ToV8(frame()->document(), context->Global(), isolate());
   DCHECK(documentWrapper->IsObject());
   // Update the cached accessor for window.document.
-  CHECK(V8PrivateProperty::getWindowDocumentCachedAccessor(m_isolate).set(
+  CHECK(V8PrivateProperty::getWindowDocumentCachedAccessor(isolate()).set(
       context, context->Global(), documentWrapper));
 }
 
-void WindowProxy::updateActivityLogger() {
+void LocalWindowProxy::updateActivityLogger() {
   m_scriptState->perContextData()->setActivityLogger(
       V8DOMActivityLogger::activityLogger(
           m_world->worldId(),
-          m_frame->isLocalFrame() && toLocalFrame(m_frame)->document()
-              ? toLocalFrame(m_frame)->document()->baseURI()
-              : KURL()));
+          frame()->document() ? frame()->document()->baseURI() : KURL()));
 }
 
-void WindowProxy::setSecurityToken(SecurityOrigin* origin) {
+void LocalWindowProxy::setSecurityToken(SecurityOrigin* origin) {
   // If two tokens are equal, then the SecurityOrigins canAccess each other.
   // If two tokens are not equal, then we have to call canAccess.
   // Note: we can't use the HTTPOrigin if it was set from the DOM.
   String token;
-  // There are two situations where v8 needs to do a full canAccess check,
-  // so set an empty security token instead:
-  // - document.domain was modified
-  // - the frame is remote
-  bool delaySet = m_frame->isRemoteFrame() ||
-                  (m_world->isMainWorld() && origin->domainWasSetInDOM());
+  // If document.domain is modified, v8 needs to do a full canAccess check,
+  // so always use an empty security token in that case.
+  bool delaySet = m_world->isMainWorld() && origin->domainWasSetInDOM();
   if (origin && !delaySet)
     token = origin->toString();
 
@@ -445,7 +220,7 @@ void WindowProxy::setSecurityToken(SecurityOrigin* origin) {
   // origins that should only allow access to themselves. In this
   // case, we use the global object as the security token to avoid
   // calling canAccess when a script accesses its own objects.
-  v8::HandleScope handleScope(m_isolate);
+  v8::HandleScope handleScope(isolate());
   v8::Local<v8::Context> context = m_scriptState->context();
   if (token.isEmpty() || token == "null") {
     context->UseDefaultSecurityToken();
@@ -454,7 +229,7 @@ void WindowProxy::setSecurityToken(SecurityOrigin* origin) {
 
   if (m_world->isIsolatedWorld()) {
     SecurityOrigin* frameSecurityOrigin =
-        m_frame->securityContext()->getSecurityOrigin();
+        frame()->document()->getSecurityOrigin();
     String frameSecurityToken = frameSecurityOrigin->toString();
     // We need to check the return value of domainWasSetInDOM() on the
     // frame's SecurityOrigin because, if that's the case, only
@@ -471,10 +246,10 @@ void WindowProxy::setSecurityToken(SecurityOrigin* origin) {
 
   // NOTE: V8 does identity comparison in fast path, must use a symbol
   // as the security token.
-  context->SetSecurityToken(v8AtomicString(m_isolate, token));
+  context->SetSecurityToken(v8AtomicString(isolate(), token));
 }
 
-void WindowProxy::updateDocument() {
+void LocalWindowProxy::updateDocument() {
   DCHECK(m_world->isMainWorld());
   // For an uninitialized main window proxy, there's nothing we need
   // to update. The update is done when the window proxy gets initialized later.
@@ -488,7 +263,7 @@ void WindowProxy::updateDocument() {
 
   updateActivityLogger();
   updateDocumentProperty();
-  updateSecurityOrigin(m_frame->securityContext()->getSecurityOrigin());
+  updateSecurityOrigin(frame()->document()->getSecurityOrigin());
 }
 
 static v8::Local<v8::Value> getNamedProperty(
@@ -505,7 +280,7 @@ static v8::Local<v8::Value> getNamedProperty(
 
   if (items->hasExactlyOneItem()) {
     HTMLElement* element = items->item(0);
-    ASSERT(element);
+    DCHECK(element);
     Frame* frame = isHTMLIFrameElement(*element)
                        ? toHTMLIFrameElement(*element).contentFrame()
                        : 0;
@@ -523,7 +298,7 @@ static void getter(v8::Local<v8::Name> property,
   // FIXME: Consider passing StringImpl directly.
   AtomicString name = toCoreAtomicString(property.As<v8::String>());
   HTMLDocument* htmlDocument = V8HTMLDocument::toImpl(info.Holder());
-  ASSERT(htmlDocument);
+  DCHECK(htmlDocument);
   v8::Local<v8::Value> result =
       getNamedProperty(htmlDocument, name, info.Holder(), info.GetIsolate());
   if (!result.IsEmpty()) {
@@ -538,8 +313,8 @@ static void getter(v8::Local<v8::Name> property,
     v8SetReturnValue(info, value);
 }
 
-void WindowProxy::namedItemAdded(HTMLDocument* document,
-                                 const AtomicString& name) {
+void LocalWindowProxy::namedItemAdded(HTMLDocument* document,
+                                      const AtomicString& name) {
   DCHECK(m_world->isMainWorld());
 
   // Context must be initialized before this point.
@@ -551,16 +326,16 @@ void WindowProxy::namedItemAdded(HTMLDocument* document,
 
   ScriptState::Scope scope(m_scriptState.get());
   v8::Local<v8::Object> documentWrapper =
-      m_world->domDataStore().get(document, m_isolate);
+      m_world->domDataStore().get(document, isolate());
   // TODO(yukishiino,peria): We should check if the own property with the same
   // name already exists or not, and if it exists, we shouldn't define a new
   // accessor property (it fails).
-  documentWrapper->SetAccessor(m_isolate->GetCurrentContext(),
-                               v8String(m_isolate, name), getter);
+  documentWrapper->SetAccessor(isolate()->GetCurrentContext(),
+                               v8String(isolate(), name), getter);
 }
 
-void WindowProxy::namedItemRemoved(HTMLDocument* document,
-                                   const AtomicString& name) {
+void LocalWindowProxy::namedItemRemoved(HTMLDocument* document,
+                                        const AtomicString& name) {
   DCHECK(m_world->isMainWorld());
 
   // Context must be initialized before this point.
@@ -574,13 +349,13 @@ void WindowProxy::namedItemRemoved(HTMLDocument* document,
     return;
   ScriptState::Scope scope(m_scriptState.get());
   v8::Local<v8::Object> documentWrapper =
-      m_world->domDataStore().get(document, m_isolate);
+      m_world->domDataStore().get(document, isolate());
   documentWrapper
-      ->Delete(m_isolate->GetCurrentContext(), v8String(m_isolate, name))
+      ->Delete(isolate()->GetCurrentContext(), v8String(isolate(), name))
       .ToChecked();
 }
 
-void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) {
+void LocalWindowProxy::updateSecurityOrigin(SecurityOrigin* origin) {
   // For an uninitialized main window proxy, there's nothing we need
   // to update. The update is done when the window proxy gets initialized later.
   if (m_lifecycle == Lifecycle::ContextUninitialized)
@@ -593,4 +368,9 @@ void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) {
   setSecurityToken(origin);
 }
 
+LocalWindowProxy::LocalWindowProxy(LocalFrame& frame,
+                                   v8::Isolate* isolate,
+                                   RefPtr<DOMWrapperWorld> world)
+    : WindowProxy(frame, isolate, std::move(world)) {}
+
 }  // namespace blink