Detach the globals of all frames, not just the main frame

third_party/WebKit/Source/web/WebFrame.cpp

Index: third_party/WebKit/Source/web/WebFrame.cpp
diff --git a/third_party/WebKit/Source/web/WebFrame.cpp b/third_party/WebKit/Source/web/WebFrame.cpp
index 5e979c40ed4872e19c0d7a41a73e207ada4aca20..0c8c2786452fd4a66a9bf3cf7897e6687746d9c3 100644
--- a/third_party/WebKit/Source/web/WebFrame.cpp
+++ b/third_party/WebKit/Source/web/WebFrame.cpp
@@ -84,15 +84,14 @@ bool WebFrame::swap(WebFrame* frame)
     FrameOwner* owner = oldFrame->owner();
     oldFrame->disconnectOwnerElement();
 
-    v8::HandleScope handleScope(v8::Isolate::GetCurrent());
-    HashMap<DOMWrapperWorld*, v8::Local<v8::Object>> globals;
-    oldFrame->windowProxyManager()->clearForNavigation();
-    oldFrame->windowProxyManager()->releaseGlobals(globals);
-
     // Although the Document in this frame is now unloaded, many resources
     // associated with the frame itself have not yet been freed yet.
     oldFrame->detach(FrameDetachType::Swap);
 
+    v8::HandleScope handleScope(v8::Isolate::GetCurrent());

[haraken, 2015/10/30 13:03:35]

toIsolate(oldFrame)

+    HashMap<DOMWrapperWorld*, v8::Local<v8::Object>> globals;
+    oldFrame->windowProxyManager()->releaseGlobals(globals);
+
     // Finally, clone the state of the current Frame into one matching
     // the type of the passed in WebFrame.
     // FIXME: This is a bit clunky; this results in pointless decrements and