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..9e012b8d197fc6b88674881d171960024cac0192 100644
--- a/third_party/WebKit/Source/web/WebFrame.cpp
+++ b/third_party/WebKit/Source/web/WebFrame.cpp
@@ -16,6 +16,7 @@
 #include "platform/UserGestureIndicator.h"
 #include "platform/heap/Handle.h"
 #include "public/web/WebElement.h"
+#include "public/web/WebKit.h"
 #include "public/web/WebSandboxFlags.h"
 #include "web/OpenedFrameTracker.h"
 #include "web/RemoteBridgeFrameOwner.h"
@@ -84,15 +85,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(mainThreadIsolate());
+    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