Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Unified Diff: third_party/WebKit/Source/core/frame/DOMWindow.cpp

Issue 2848503002: Revert of binding: Changes the association among global-proxy/global/window-instance (2nd attempt).… (Closed)
Patch Set: Updated the test expectation. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/V8BindingForCore.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/frame/DOMWindow.cpp
diff --git a/third_party/WebKit/Source/core/frame/DOMWindow.cpp b/third_party/WebKit/Source/core/frame/DOMWindow.cpp
index b3ce2ee566fa7e336ee32eb886f915a99b2b740a..308c99c1fa0091a12aca8bafaba1465489de8a8d 100644
--- a/third_party/WebKit/Source/core/frame/DOMWindow.cpp
+++ b/third_party/WebKit/Source/core/frame/DOMWindow.cpp
@@ -40,30 +40,12 @@ DOMWindow::DOMWindow(Frame& frame)
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(
« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/V8BindingForCore.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698