Deal with frame removal by content scripts

content/renderer/mojo_bindings_controller.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/mojo_bindings_controller.h"
 
 #include "content/common/view_messages.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "content/renderer/mojo_context_state.h"
@@ skipping 53 matching lines @@
       context_data->GetUserData(kMojoContextStateKey));
   return context_state ? context_state->state.get() : NULL;
 }
 
 void MojoBindingsController::WillReleaseScriptContext(
     v8::Local<v8::Context> context,
     int world_id) {
   DestroyContextState(context);
 }
 
-void MojoBindingsController::DidFinishDocumentLoad() {
+void MojoBindingsController::RunScriptsAtDocumentStart() {
+  CreateContextState();
+}
+
+void MojoBindingsController::RunScriptsAtDocumentReady() {
   v8::HandleScope handle_scope(blink::mainThreadIsolate());
   MojoContextState* state = GetContextState();
   if (state)
     state->Run();
 }
 
-void MojoBindingsController::DidCreateDocumentElement() {
-  CreateContextState();
-}
-
 void MojoBindingsController::DidClearWindowObject() {
   // NOTE: this function may be called early on twice. From the constructor
   // mainWorldScriptContext() may trigger this to be called. If we are created
   // before the page is loaded (which is very likely), then on first load this
   // is called. In the case of the latter we may have already supplied the
   // handle to the context state so that if we destroy now the handle is
   // lost. If this is the result of the first load then the contextstate should
   // be empty and we don't need to destroy it.
   MojoContextState* state = GetContextState();
   if (state && !state->module_added())
     return;
 
   v8::HandleScope handle_scope(blink::mainThreadIsolate());
   DestroyContextState(render_frame()->GetWebFrame()->mainWorldScriptContext());
 }
 
 }  // namespace content