binding: Changes the association among global-proxy/global/window-instance (2nd attempt).

third_party/WebKit/Source/core/frame/DOMWindow.cpp

 // Copyright 2014 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 "core/frame/DOMWindow.h"
 
 #include <memory>
 
 #include "bindings/core/v8/WindowProxyManager.h"
 #include "core/dom/Document.h"
@@ skipping 21 matching lines @@
 namespace blink {
 
 DOMWindow::DOMWindow(Frame& frame)
     : frame_(frame),
       window_proxy_manager_(frame.GetWindowProxyManager()),
       window_is_closing_(false) {}
 
 DOMWindow::~DOMWindow() {
   // The frame must be disconnected before finalization.
   DCHECK(!frame_);
+
+  // Because the wrapper object of a DOMWindow is the global proxy, which may
+  // live much longer than the DOMWindow, we need to dissociate all wrappers
+  // for this instance.
+  DOMWrapperWorld::DissociateDOMWindowWrappersInAllWorlds(this);
 }
 
-v8::Local<v8::Object> DOMWindow::Wrap(v8::Isolate*,
+v8::Local<v8::Object> DOMWindow::Wrap(v8::Isolate* isolate,
                                       v8::Local<v8::Object> creation_context) {
-  LOG(FATAL) << "DOMWindow must never be wrapped with wrap method.  The "
-                "wrappers must be created at WindowProxy::createContext() and "
-                "setupWindowPrototypeChain().";
-  return v8::Local<v8::Object>();
+  // Notice that we explicitly ignore |creation_context| because the DOMWindow
+  // has its own creation context.
+
+  // TODO(yukishiino): Make this function always return the non-empty handle
+  // even if the frame is detached because the global proxy must always exist
+  // per spec.
+  return window_proxy_manager_
+      ->GetWindowProxy(DOMWrapperWorld::Current(isolate))
+      ->GlobalProxyIfNotDetached();
 }
 
 v8::Local<v8::Object> DOMWindow::AssociateWithWrapper(
     v8::Isolate*,
     const WrapperTypeInfo*,
     v8::Local<v8::Object> wrapper) {
-  LOG(FATAL) << "DOMWindow must never be wrapped with wrap method.  The "
-                "wrappers must be created at WindowProxy::createContext() and "
-                "setupWindowPrototypeChain().";
+  NOTREACHED();
   return v8::Local<v8::Object>();
 }
 
 const AtomicString& DOMWindow::InterfaceName() const {
   return EventTargetNames::DOMWindow;
 }
 
 const DOMWindow* DOMWindow::ToDOMWindow() const {
   return this;
 }
@@ skipping 361 matching lines @@
   }
 
   // If we're a top level window, bring the window to the front.
   if (GetFrame()->IsMainFrame() && allow_focus)
     page->GetChromeClient().Focus();
 
   page->GetFocusController().FocusDocumentView(GetFrame(),
                                                true /* notifyEmbedder */);
 }
 
-v8::Local<v8::Object> DOMWindow::GlobalProxy(DOMWrapperWorld& world) {
-  // TODO(yukishiino): Make this function always return the non-empty handle
-  // even if the frame is detached because the global proxy must always exist
-  // per spec.
-  return window_proxy_manager_->GetWindowProxy(world)
-      ->GlobalProxyIfNotDetached();
-}
-
 InputDeviceCapabilitiesConstants* DOMWindow::GetInputDeviceCapabilities() {
   if (!input_capabilities_)
     input_capabilities_ = new InputDeviceCapabilitiesConstants;
   return input_capabilities_;
 }
 
 DEFINE_TRACE(DOMWindow) {
   visitor->Trace(frame_);
   visitor->Trace(window_proxy_manager_);
   visitor->Trace(input_capabilities_);
   visitor->Trace(location_);
   EventTargetWithInlineData::Trace(visitor);
 }
 
 }  // namespace blink