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

third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp

 /*
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
@@ skipping 113 matching lines @@
         // Dispose of the underlying V8 object before releasing our reference
         // to it, so that if a plugin fails to release it properly we will
         // only leak the NPObject wrapper, not the object, its document, or
         // anything else they reference.
         disposeUnderlyingV8Object(isolate(), m_windowScriptNPObject);
         _NPN_ReleaseObject(m_windowScriptNPObject);
         m_windowScriptNPObject = 0;
     }
 }
 
-void ScriptController::clearForClose()
-{
-    double start = currentTime();
-    m_windowProxyManager->clearForClose();
-    Platform::current()->histogramCustomCounts("WebCore.ScriptController.clearForClose", (currentTime() - start) * 1000, 0, 10000, 50);
-}
-
 void ScriptController::updateSecurityOrigin(SecurityOrigin* origin)
 {
     m_windowProxyManager->mainWorldProxy()->updateSecurityOrigin(origin);
     Vector<std::pair<ScriptState*, SecurityOrigin*>> isolatedContexts;
     m_windowProxyManager->collectIsolatedContexts(isolatedContexts);
     for (auto isolatedContext : isolatedContexts)
         m_windowProxyManager->windowProxy(isolatedContext.first->world())->updateSecurityOrigin(isolatedContext.second);
 }
 
 v8::MaybeLocal<v8::Value> ScriptController::callFunction(v8::Local<v8::Function> function, v8::Local<v8::Value> receiver, int argc, v8::Local<v8::Value> info[])
@@ skipping 248 matching lines @@
     return npCreateV8ScriptObject(scriptState->isolate(), 0, v8::Local<v8::Object>::Cast(v8plugin), window);
 }
 
 void ScriptController::clearWindowProxy()
 {
     // V8 binding expects ScriptController::clearWindowProxy only be called
     // when a frame is loading a new page. This creates a new context for the new page.
 
     double start = currentTime();
     // The V8 context must be available for |clearScriptObjects()|.
-    // The below call must be before |clearForNavigation()| which disposes the V8 context.
+    // The below call must be before |clearWindowProxy()| which disposes the V8 context.
     clearScriptObjects();
 
-    m_windowProxyManager->clearForNavigation();
+    m_windowProxyManager->clearWindowProxy();
     Platform::current()->histogramCustomCounts("WebCore.ScriptController.clearWindowProxy", (currentTime() - start) * 1000, 0, 10000, 50);
 }
 
 void ScriptController::setCaptureCallStackForUncaughtExceptions(bool value)
 {
     v8::V8::SetCaptureStackTraceForUncaughtExceptions(value, ScriptCallStack::maxCallStackSizeToCapture, stackTraceOptions);
 }
 
 void ScriptController::collectIsolatedContexts(Vector<std::pair<ScriptState*, SecurityOrigin*>>& result)
 {
@@ skipping 174 matching lines @@
         for (size_t i = 0; i < resultArray->Length(); ++i) {
             v8::Local<v8::Value> value;
             if (!resultArray->Get(scriptState->context(), i).ToLocal(&value))
                 return;
             results->append(value);
         }
     }
 }
 
 } // namespace blink