Refactor WindowProxy into Local and Remote subclasses.

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

Index: third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.cpp b/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.cpp
index d73a8213cddbdcdcc2c3f37bb5784c93c98b2a32..8e7a752720b45b56d834a48b14ccebe4d2bc6a43 100644
--- a/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.cpp
@@ -5,22 +5,31 @@
 #include "bindings/core/v8/WindowProxyManager.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
-#include "bindings/core/v8/WindowProxy.h"
-#include "core/frame/Frame.h"
 
 namespace blink {
 
-WindowProxyManager* WindowProxyManager::create(Frame& frame) {
-  return new WindowProxyManager(frame);
+namespace {
+
+WindowProxy* createWindowProxyForFrame(v8::Isolate* isolate,
+                                       Frame& frame,
+
+                                       RefPtr<DOMWrapperWorld> world) {
+  if (frame.isLocalFrame()) {
+    return LocalWindowProxy::create(isolate, toLocalFrame(frame),
+                                    std::move(world));
+  }
+  return RemoteWindowProxy::create(isolate, toRemoteFrame(frame),
+                                   std::move(world));
+}
 }
 
-DEFINE_TRACE(WindowProxyManager) {
+DEFINE_TRACE(WindowProxyManagerBase) {
   visitor->trace(m_frame);
   visitor->trace(m_windowProxy);
   visitor->trace(m_isolatedWorlds);
 }
 
-WindowProxy* WindowProxyManager::windowProxy(DOMWrapperWorld& world) {
+WindowProxy* WindowProxyManagerBase::windowProxy(DOMWrapperWorld& world) {
   WindowProxy* windowProxy = nullptr;
   if (world.isMainWorld()) {
     windowProxy = m_windowProxy.get();
@@ -29,36 +38,26 @@ WindowProxy* WindowProxyManager::windowProxy(DOMWrapperWorld& world) {
     if (iter != m_isolatedWorlds.end()) {
       windowProxy = iter->value.get();
     } else {
-      windowProxy = WindowProxy::create(m_isolate, m_frame, world);
+      windowProxy = createWindowProxyForFrame(m_isolate, *m_frame, &world);
       m_isolatedWorlds.set(world.worldId(), windowProxy);
     }
   }
   return windowProxy;
 }
 
-void WindowProxyManager::clearForClose() {
+void WindowProxyManagerBase::clearForClose() {
   m_windowProxy->clearForClose();
   for (auto& entry : m_isolatedWorlds)
     entry.value->clearForClose();
 }
 
-void WindowProxyManager::clearForNavigation() {
+void WindowProxyManagerBase::clearForNavigation() {
   m_windowProxy->clearForNavigation();
   for (auto& entry : m_isolatedWorlds)
     entry.value->clearForNavigation();
 }
 
-void WindowProxyManager::updateSecurityOrigin(SecurityOrigin* securityOrigin) {
-  m_windowProxy->updateSecurityOrigin(securityOrigin);
-  for (auto& entry : m_isolatedWorlds) {
-    WindowProxy* isolatedWindowProxy = entry.value.get();
-    SecurityOrigin* isolatedSecurityOrigin =
-        isolatedWindowProxy->world().isolatedWorldSecurityOrigin();
-    isolatedWindowProxy->updateSecurityOrigin(isolatedSecurityOrigin);
-  }
-}
-
-void WindowProxyManager::releaseGlobals(
+void WindowProxyManagerBase::releaseGlobals(
     HashMap<DOMWrapperWorld*, v8::Local<v8::Object>>& map) {
   map.add(&m_windowProxy->world(), m_windowProxy->releaseGlobal());
   for (auto& entry : m_isolatedWorlds)
@@ -66,17 +65,30 @@ void WindowProxyManager::releaseGlobals(
             windowProxy(entry.value->world())->releaseGlobal());
 }
 
-void WindowProxyManager::setGlobals(
+void WindowProxyManagerBase::setGlobals(
     const HashMap<DOMWrapperWorld*, v8::Local<v8::Object>>& map) {
   for (auto& entry : map)
     windowProxy(*entry.key)->setGlobal(entry.value);
 }
 
-WindowProxyManager::WindowProxyManager(Frame& frame)
-    : m_frame(&frame),
-      m_isolate(v8::Isolate::GetCurrent()),
-      m_windowProxy(WindowProxy::create(m_isolate,
-                                        &frame,
-                                        DOMWrapperWorld::mainWorld())) {}
+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);
+  }
+}
 
 }  // namespace blink