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

extensions/renderer/user_script_injector.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/user_script_injector.h"
 
 #include <tuple>
 #include <vector>
 
 #include "base/lazy_instance.h"
@@ skipping 120 matching lines @@
 
 bool UserScriptInjector::IsUserGesture() const {
   return false;
 }
 
 bool UserScriptInjector::ExpectsResults() const {
   return false;
 }
 
 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(
     const InjectionHost* injection_host,
     blink::WebLocalFrame* web_frame,
     int tab_id) const {
   // There is no harm in allowing the injection when the script is gone,
   // because there is nothing to inject.
   if (!script_)
     return PermissionsData::ACCESS_ALLOWED;
@@ skipping 30 matching lines @@
       web_frame, web_frame->document().url(), script_->match_about_blank());
 
   return injection_host->CanExecuteOnFrame(
       effective_document_url,
       content::RenderFrame::FromWebFrame(web_frame),
       tab_id,
       is_declarative_);
 }
 
 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);
 
   const UserScript::FileList& js_scripts = script_->js_scripts();
 
   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
     // Greasemonkey does.
     if (script_->emulate_greasemonkey()) {
       content.insert(0, kUserScriptHead);
       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
   // user scripts.
   if (script_->emulate_greasemonkey())
     sources.insert(sources.begin(), g_greasemonkey_api.Get().GetSource());
 
   return sources;
 }
 
 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;
 }
 
 void UserScriptInjector::GetRunInfo(
     ScriptsRunInfo* scripts_run_info,
     UserScript::RunLocation run_location) const {
   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();
          iter != js_scripts.end();
          ++iter) {
       scripts_run_info->executing_scripts[host_id_.id()].insert(
           iter->url().path());
     }
   }
 
-  if (ShouldInjectCss(run_location))
+  if (ShouldInjectCss(run_location, scripts_run_info))
     scripts_run_info->num_css += script_->css_scripts().size();
 }
 
 void UserScriptInjector::OnInjectionComplete(
     std::unique_ptr<base::Value> execution_result,
     UserScript::RunLocation run_location,
     content::RenderFrame* render_frame) {}
 
 void UserScriptInjector::OnWillNotInject(InjectFailureReason reason,
                                          content::RenderFrame* render_frame) {
 }
 
 }  // namespace extensions