Invalidate the previous frame when the window object is cleared.

extensions/renderer/script_injection_manager.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 "extensions/renderer/script_injection_manager.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "content/public/renderer/render_view.h"
@@ skipping 23 matching lines @@
 }  // namespace
 
 class ScriptInjectionManager::RVOHelper : public content::RenderViewObserver {
  public:
   RVOHelper(content::RenderView* render_view, ScriptInjectionManager* manager);
   ~RVOHelper() override;
 
  private:
   // RenderViewObserver implementation.
   bool OnMessageReceived(const IPC::Message& message) override;
+  void DidCreateNewDocument(blink::WebLocalFrame* frame) override;
   void DidCreateDocumentElement(blink::WebLocalFrame* frame) override;
   void DidFinishDocumentLoad(blink::WebLocalFrame* frame) override;
   void DidFinishLoad(blink::WebLocalFrame* frame) override;
-  void DidStartProvisionalLoad(blink::WebLocalFrame* frame) override;
   void FrameDetached(blink::WebFrame* frame) override;
   void OnDestruct() override;
 
   virtual void OnExecuteCode(const ExtensionMsg_ExecuteCode_Params& params);
   virtual void OnExecuteDeclarativeScript(int tab_id,
                                           const ExtensionId& extension_id,
                                           int script_id,
                                           const GURL& url);
   virtual void OnPermitScriptInjection(int64 request_id);
 
@@ skipping 34 matching lines @@
     IPC_MESSAGE_HANDLER(ExtensionMsg_ExecuteCode, OnExecuteCode)
     IPC_MESSAGE_HANDLER(ExtensionMsg_PermitScriptInjection,
                         OnPermitScriptInjection)
     IPC_MESSAGE_HANDLER(ExtensionMsg_ExecuteDeclarativeScript,
                         OnExecuteDeclarativeScript)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
+void ScriptInjectionManager::RVOHelper::DidCreateNewDocument(
+    blink::WebLocalFrame* frame) {
+  // A new document is going to be shown, so invalidate the old document state.
+  // Check that the frame's state is known before invalidating the frame,
+  // because it is possible that a script injection was scheduled before the
+  // page was loaded, e.g. by navigating to a javascript: URL before the page
+  // has loaded.
+  if (manager_->frame_statuses_.find(frame) != manager_->frame_statuses_.end())
+    InvalidateFrame(frame);

[not at google - send to devlin, 2014/11/17 22:20:05]

Let's just call InvalidateFrame(frame) and forget about the check, everything
should work fine. None of the other methods that call this worry about whether
or not the frame was actually used.

+}
+
 void ScriptInjectionManager::RVOHelper::DidCreateDocumentElement(
     blink::WebLocalFrame* frame) {
   manager_->InjectScripts(frame, UserScript::DOCUMENT_START);
 }
 
 void ScriptInjectionManager::RVOHelper::DidFinishDocumentLoad(
     blink::WebLocalFrame* frame) {
   manager_->InjectScripts(frame, UserScript::DOCUMENT_END);
   pending_idle_frames_.insert(frame);
   // We try to run idle in two places: here and DidFinishLoad.
@@ skipping 18 matching lines @@
   // DidFinishDocumentLoad should strictly come before DidFinishLoad, so the
   // first posted task to RunIdle() pops it out of the set. This ensures we
   // don't try to run idle twice.
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&ScriptInjectionManager::RVOHelper::RunIdle,
                  weak_factory_.GetWeakPtr(),
                  frame));
 }
 
-void ScriptInjectionManager::RVOHelper::DidStartProvisionalLoad(
-    blink::WebLocalFrame* frame) {
-  // We're starting a new load - invalidate.
-  InvalidateFrame(frame);
-}
-
 void ScriptInjectionManager::RVOHelper::FrameDetached(blink::WebFrame* frame) {
   // The frame is closing - invalidate.
   InvalidateFrame(frame);
 }
 
 void ScriptInjectionManager::RVOHelper::OnDestruct() {
   manager_->RemoveObserver(this);
 }
 
 void ScriptInjectionManager::RVOHelper::OnExecuteCode(
@@ skipping 244 matching lines @@
 
   ScriptsRunInfo scripts_run_info;
   if (injection->OnPermissionGranted(extensions_->GetByID(
                                          injection->extension_id()),
                                      &scripts_run_info)) {
     scripts_run_info.LogRun(injection->web_frame(), UserScript::RUN_DEFERRED);
   }
 }
 
 }  // namespace extensions