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

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

 /*
  * Copyright (C) 2008, 2009, 2011 Google Inc. 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
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 73 matching lines @@
 
 WindowProxy::WindowProxy(Frame* frame, PassRefPtr<DOMWrapperWorld> world, v8::Isolate* isolate)
     : m_frame(frame)
     , m_isolate(isolate)
     , m_world(world)
 {
 }
 
 WindowProxy::~WindowProxy()
 {
-    // clearForClose() or clearForNavigation() must be invoked before destruction starts.
+    // clearWindowProxy() must be invoked before destruction starts.
     ASSERT(!isContextInitialized());
 }
 
 DEFINE_TRACE(WindowProxy)
 {
     visitor->trace(m_frame);
 }
 
 void WindowProxy::disposeContext(GlobalDetachmentBehavior behavior)
 {
@@ skipping 15 matching lines @@
         m_scriptState->detachGlobalObject();
 
     m_scriptState->disposePerContextData();
 
     // It's likely that disposing the context has created a lot of
     // garbage. Notify V8 about this so it'll have a chance of cleaning
     // it up when idle.
     V8GCForContextDispose::instance().notifyContextDisposed(m_frame->isMainFrame());
 }
 
-void WindowProxy::clearForClose()
+void WindowProxy::clearWindowProxy()
 {
     if (!isContextInitialized())
         return;
-
-    disposeContext(DoNotDetachGlobal);
-}
-
-void WindowProxy::clearForNavigation()
-{
-    if (!isContextInitialized())
-        return;
 
     ScriptState::Scope scope(m_scriptState.get());
 
     disposeContext(DetachGlobal);
 }
 
 v8::Local<v8::Object> WindowProxy::releaseGlobal()
 {
     ASSERT(!isContextInitialized());
     // If a ScriptState was created, the context was initialized at some point.
-    // Make sure the global object was detached from the proxy by calling clearForNavigation().
+    // Make sure the global object was detached from the proxy by calling clearWindowProxy().
     if (m_scriptState)
         ASSERT(m_scriptState->isGlobalObjectDetached());
     v8::Local<v8::Object> global = m_global.newLocal(m_isolate);
     m_global.clear();
     return global;
 }
 
 void WindowProxy::setGlobal(v8::Local<v8::Object> global)
 {
     m_global.set(m_isolate, global);
@@ skipping 407 matching lines @@
 }
 
 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin)
 {
     if (!isContextInitialized())
         return;
     setSecurityToken(origin);
 }
 
 } // namespace blink