Prevent duplicate content script injection defined in manifest.json (reland)

extensions/renderer/user_script_injector.cc

Index: extensions/renderer/user_script_injector.cc
diff --git a/extensions/renderer/user_script_injector.cc b/extensions/renderer/user_script_injector.cc
index 1910548ba24b340d720cd7eb4ea16d8af38e6416..65a292ff51ff179c0b9b86502395510de5c68353 100644
--- a/extensions/renderer/user_script_injector.cc
+++ b/extensions/renderer/user_script_injector.cc
@@ -138,15 +138,19 @@ bool UserScriptInjector::ExpectsResults() const {
 }
 
 bool UserScriptInjector::ShouldInjectJs(
-    UserScript::RunLocation run_location) const {
+    UserScript::RunLocation run_location,
+    ScriptsRunInfo* scripts_run_info) const {
   return script_ && script_->run_location() == run_location &&
-         !script_->js_scripts().empty();
+         !script_->js_scripts().empty() &&
+         !scripts_run_info->injected_scripts.empty();

[Devlin, 2016/08/03 23:34:44]

Same comment as in programmatic script injector.

[catmullings, 2016/08/09 23:13:41]

Done.

 }
 
 bool UserScriptInjector::ShouldInjectCss(
-    UserScript::RunLocation run_location) const {
+    UserScript::RunLocation run_location,
+    ScriptsRunInfo* scripts_run_info) const {
   return script_ && run_location == UserScript::DOCUMENT_START &&
-         !script_->css_scripts().empty();
+         !script_->css_scripts().empty() &&
+         !scripts_run_info->injected_scripts.empty();
 }
 
 PermissionsData::AccessType UserScriptInjector::CanExecuteOnFrame(
@@ -197,10 +201,10 @@ PermissionsData::AccessType UserScriptInjector::CanExecuteOnFrame(
 }
 
 std::vector<blink::WebScriptSource> UserScriptInjector::GetJsSources(
-    UserScript::RunLocation run_location) const {
+    UserScript::RunLocation run_location,
+    ScriptsRunInfo* scripts_run_info) const {
+  DCHECK(script_ != NULL);

[Devlin, 2016/08/03 23:34:44]

DCHECK(script_) is sufficient.

[catmullings, 2016/08/09 23:13:41]

Done.

   std::vector<blink::WebScriptSource> sources;
-  if (!script_)
-    return sources;
 
   DCHECK_EQ(script_->run_location(), run_location);
 
@@ -209,6 +213,11 @@ std::vector<blink::WebScriptSource> UserScriptInjector::GetJsSources(
   for (UserScript::FileList::const_iterator iter = js_scripts.begin();
        iter != js_scripts.end();
        ++iter) {
+    const GURL& script_url = iter->url();
+    // Check if the script is already injected.
+    if (scripts_run_info->injected_scripts.count(script_url) != 0)
+      continue;
+
     std::string content = iter->GetContent().as_string();
 
     // We add this dumb function wrapper for user scripts to emulate what
@@ -218,7 +227,9 @@ std::vector<blink::WebScriptSource> UserScriptInjector::GetJsSources(
       content += kUserScriptTail;
     }
     sources.push_back(blink::WebScriptSource(
-        blink::WebString::fromUTF8(content), iter->url()));
+        blink::WebString::fromUTF8(content), script_url));
+
+    scripts_run_info->injected_scripts.insert(script_url);
   }
 
   // Emulate Greasemonkey API for scripts that were converted to extension
@@ -230,18 +241,26 @@ std::vector<blink::WebScriptSource> UserScriptInjector::GetJsSources(
 }
 
 std::vector<std::string> UserScriptInjector::GetCssSources(
-    UserScript::RunLocation run_location) const {
+    UserScript::RunLocation run_location,
+    ScriptsRunInfo* scripts_run_info) const {
+  DCHECK(script_ != NULL);
   DCHECK_EQ(UserScript::DOCUMENT_START, run_location);
 
   std::vector<std::string> sources;
-  if (!script_)
-    return sources;
 
   const UserScript::FileList& css_scripts = script_->css_scripts();
+
   for (UserScript::FileList::const_iterator iter = css_scripts.begin();
        iter != css_scripts.end();
        ++iter) {
-    sources.push_back(iter->GetContent().as_string());
+    const GURL& script_url = iter->url();
+    // Check if the stylesheet is already injected.
+    if (scripts_run_info->injected_scripts.find(script_url) ==
+        scripts_run_info->injected_scripts.end()) {
+      sources.push_back(iter->GetContent().as_string());
+
+      scripts_run_info->injected_scripts.insert(script_url);
+    }
   }
   return sources;
 }
@@ -252,7 +271,7 @@ void UserScriptInjector::GetRunInfo(
   if (!script_)

[catmullings, 2016/08/03 23:31:22]

Should this be removed as well and converted into a DCHECK?

[catmullings, 2016/08/09 23:13:41]

bump

[Devlin, 2016/08/10 19:23:27]

Yep. :)

     return;
 
-  if (ShouldInjectJs(run_location)) {
+  if (ShouldInjectJs(run_location, scripts_run_info)) {
     const UserScript::FileList& js_scripts = script_->js_scripts();
     scripts_run_info->num_js += js_scripts.size();
     for (UserScript::FileList::const_iterator iter = js_scripts.begin();
@@ -263,7 +282,7 @@ void UserScriptInjector::GetRunInfo(
     }
   }
 
-  if (ShouldInjectCss(run_location))
+  if (ShouldInjectCss(run_location, scripts_run_info))
     scripts_run_info->num_css += script_->css_scripts().size();
 }