Make ScriptBadgeController record when extensions run scripts on pages yet to

chrome/browser/extensions/script_badge_controller.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/script_badge_controller.h"
 
 #include "chrome/browser/extensions/browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/tab_helper.h"
@@ skipping 74 matching lines @@
       return extension->ShowConfigureContextMenus() ?
           ACTION_SHOW_CONTEXT_MENU : ACTION_NONE;
   }
 
   return ACTION_NONE;
 }
 
 void ScriptBadgeController::OnExecuteScriptFinished(
     const std::string& extension_id,
     bool success,
-    int32 page_id,
+    int32 on_page_id,
     const std::string& error,
     const base::ListValue& script_results) {
-  if (success && page_id == GetPageID()) {
-    if (MarkExtensionExecuting(extension_id))
-      NotifyChange();
+  if (!success)
+    return;
+
+  int current_page_id = GetPageID();
+  if (on_page_id < current_page_id)

[Jeffrey Yasskin, 2012/07/25 22:22:39]

Is there documentation that the page id monotonically increases? I don't see it
in navigation_entry.h.

[not at google - send to devlin, 2012/07/26 08:52:46]

Yeah, I don't know. @jam do you know?

+    return;
+  if (on_page_id > current_page_id) {
+    future_actions_[on_page_id].push_back(extension_id);
+    return;
   }
+
+  if (MarkExtensionExecuting(extension_id))
+    NotifyChange();
 }
 
 ExtensionService* ScriptBadgeController::GetExtensionService() {
   return extensions::ExtensionSystem::Get(
       tab_contents_->profile())->extension_service();
 }
 
 int32 ScriptBadgeController::GetPageID() {
-  return tab_contents_->web_contents()->GetController().GetActiveEntry()->
-      GetPageID();
+  content::NavigationEntry* active_entry =
+      tab_contents_->web_contents()->GetController().GetActiveEntry();
+  return active_entry ? active_entry->GetPageID() : -1;
 }
 
 void ScriptBadgeController::NotifyChange() {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_LOCATION_BAR_UPDATED,
       content::Source<Profile>(tab_contents_->profile()),
       content::Details<TabContents>(tab_contents_));
 }
 
 void ScriptBadgeController::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   if (details.is_in_page)
     return;
   extensions_in_current_actions_.clear();
   current_actions_.clear();
+
+  // Immediately process any actions that were made on this page before
+  // the browser caught up to it.
+  int current_page_id = GetPageID();
+  bool changed = false;
+
+  FutureActionsMap::iterator actions = future_actions_.find(current_page_id);
+  if (actions != future_actions_.end()) {
+    for (std::vector<std::string>::iterator it = actions->second.begin();
+         it != actions->second.end(); ++it) {
+      changed |= MarkExtensionExecuting(*it);
+    }
+    future_actions_.erase(actions);
+  }
+
+  // We might have skipped over a page ID.
+  for (FutureActionsMap::iterator it = future_actions_.begin();
+       it != future_actions_.end();) {
+    if (it->first < current_page_id)
+      future_actions_.erase(it++);
+    else
+      ++it;
+  }
+
+  if (changed)
+    NotifyChange();
 }
 
 void ScriptBadgeController::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_EXTENSION_UNLOADED);
   const Extension* extension =
       content::Details<UnloadedExtensionInfo>(details)->extension;
   if (EraseExtension(extension))
     NotifyChange();
 }
 
 bool ScriptBadgeController::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ScriptBadgeController, message)
     IPC_MESSAGE_HANDLER(ExtensionHostMsg_ContentScriptsExecuting,
                         OnContentScriptsExecuting)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void ScriptBadgeController::OnContentScriptsExecuting(
-    const std::set<std::string>& extension_ids, int32 page_id) {
-  if (page_id != GetPageID())
+    const std::set<std::string>& extension_ids,
+    int32 on_page_id) {
+  int current_page_id = GetPageID();
+  if (on_page_id < current_page_id)
     return;
+  if (on_page_id > current_page_id) {
+    std::vector<std::string>& actions = future_actions_[on_page_id];
+    actions.insert(actions.end(),
+                   extension_ids.begin(),
+                   extension_ids.end());
+    return;
+  }
 
   bool changed = false;
   for (std::set<std::string>::const_iterator it = extension_ids.begin();
        it != extension_ids.end(); ++it) {
     changed |= MarkExtensionExecuting(*it);
   }
   if (changed)
     NotifyChange();
 }
 
@@ skipping 44 matching lines @@
       current_actions_.erase(it);
       break;
     }
   }
 
   CHECK_EQ(size_before, current_actions_.size() + 1);
   return true;
 }
 
 }  // namespace extensions