Make ScriptController inherit LocalWindowProxyManager

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "bindings/core/v8/WindowProxyManager.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
 
 namespace blink {
 
@@ skipping 11 matching lines @@
                                    std::move(world));
 }
 }
 
 DEFINE_TRACE(WindowProxyManagerBase) {
   visitor->trace(m_frame);
   visitor->trace(m_windowProxy);
   visitor->trace(m_isolatedWorlds);
 }
 
-WindowProxy* WindowProxyManagerBase::windowProxy(DOMWrapperWorld& world) {
-  WindowProxy* windowProxy = nullptr;
-  if (world.isMainWorld()) {
-    windowProxy = m_windowProxy.get();
-  } else {
-    IsolatedWorldMap::iterator iter = m_isolatedWorlds.find(world.worldId());
-    if (iter != m_isolatedWorlds.end()) {
-      windowProxy = iter->value.get();
-    } else {
-      windowProxy = createWindowProxyForFrame(m_isolate, *m_frame, &world);
-      m_isolatedWorlds.set(world.worldId(), windowProxy);
-    }
-  }
-  return windowProxy;
-}
-
 void WindowProxyManagerBase::clearForClose() {
   m_windowProxy->clearForClose();
   for (auto& entry : m_isolatedWorlds)
     entry.value->clearForClose();
 }
 
 void WindowProxyManagerBase::clearForNavigation() {
   m_windowProxy->clearForNavigation();
   for (auto& entry : m_isolatedWorlds)
     entry.value->clearForNavigation();
 }
 
 void WindowProxyManagerBase::releaseGlobals(
     HashMap<DOMWrapperWorld*, v8::Local<v8::Object>>& map) {
   map.add(&m_windowProxy->world(), m_windowProxy->releaseGlobal());
   for (auto& entry : m_isolatedWorlds)
     map.add(&entry.value->world(),
             windowProxy(entry.value->world())->releaseGlobal());

[dcheng, 2017/01/13 18:57:30]

I missed this in my original patch, but a few tests broke. I simplified this to
just use the map entries directly.

 }
 
 void WindowProxyManagerBase::setGlobals(
     const HashMap<DOMWrapperWorld*, v8::Local<v8::Object>>& map) {
+  // Note: it's important not to initialize the WindowProxy before SetGlobal()
+  // is called. Otherwise, the global proxy object the WindowProxy thinks it has
+  // and the global proxy object of any actual v8 contexts will not match!
   for (auto& entry : map)
-    windowProxy(*entry.key)->setGlobal(entry.value);
+    possiblyUninitializedWindowProxy(*entry.key)->setGlobal(entry.value);
 }
 
 WindowProxyManagerBase::WindowProxyManagerBase(Frame& frame)
     : m_isolate(v8::Isolate::GetCurrent()),
       m_frame(&frame),
       m_windowProxy(createWindowProxyForFrame(m_isolate,
                                               frame,
                                               &DOMWrapperWorld::mainWorld())) {}
 
-void LocalWindowProxyManager::updateSecurityOrigin(
-    SecurityOrigin* securityOrigin) {
-  static_cast<LocalWindowProxy*>(mainWorldProxy())
-      ->updateSecurityOrigin(securityOrigin);
-  for (auto& entry : isolatedWorlds()) {
-    auto* isolatedWindowProxy =
-        static_cast<LocalWindowProxy*>(entry.value.get());
-    SecurityOrigin* isolatedSecurityOrigin =
-        isolatedWindowProxy->world().isolatedWorldSecurityOrigin();
-    isolatedWindowProxy->updateSecurityOrigin(isolatedSecurityOrigin);
+WindowProxy* WindowProxyManagerBase::windowProxy(DOMWrapperWorld& world) {
+  WindowProxy* windowProxy = possiblyUninitializedWindowProxy(world);
+  windowProxy->initializeIfNeeded();
+  return windowProxy;
+}
+
+WindowProxy* WindowProxyManagerBase::possiblyUninitializedWindowProxy(
+    DOMWrapperWorld& world) {
+  WindowProxy* windowProxy = nullptr;
+  if (world.isMainWorld()) {
+    windowProxy = m_windowProxy.get();
+  } else {
+    IsolatedWorldMap::iterator iter = m_isolatedWorlds.find(world.worldId());
+    if (iter != m_isolatedWorlds.end()) {
+      windowProxy = iter->value.get();
+    } else {
+      windowProxy = createWindowProxyForFrame(m_isolate, *m_frame, &world);
+      m_isolatedWorlds.set(world.worldId(), windowProxy);
+    }
   }
+  return windowProxy;
 }
 
 }  // namespace blink