Revert of 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 22 matching lines @@
 
 DOMWindow::DOMWindow(Frame& frame)
     : frame_(frame),
       window_proxy_manager_(frame.GetWindowProxyManager()),
       location_(this, nullptr),
       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* isolate,
                                       v8::Local<v8::Object> creation_context) {
-  // Notice that we explicitly ignore |creation_context| because the DOMWindow
-  // has its own creation context.
-
-  // TODO(yukishiino): Get understanding of why it's possible to initialize
-  // the context after the frame is detached.  And then, remove the following
-  // lines.  See also https://crbug.com/712638 .
-  if (!GetFrame())
-    return v8::Local<v8::Object>();
-
-  // 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();
+  NOTREACHED();
+  return v8::Local<v8::Object>();
 }
 
 v8::Local<v8::Object> DOMWindow::AssociateWithWrapper(
     v8::Isolate*,
     const WrapperTypeInfo*,
     v8::Local<v8::Object> wrapper) {
   NOTREACHED();
   return v8::Local<v8::Object>();
 }
 
@@ skipping 388 matching lines @@
   visitor->Trace(location_);
   EventTargetWithInlineData::Trace(visitor);
 }
 
 DEFINE_TRACE_WRAPPERS(DOMWindow) {
   visitor->TraceWrappers(location_);
   EventTargetWithInlineData::TraceWrappers(visitor);
 }
 
 }  // namespace blink