[Extensions] Reduce string copy in renderer/ UserScript.

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 185 matching lines @@
 
 std::vector<blink::WebScriptSource> UserScriptInjector::GetJsSources(
     UserScript::RunLocation run_location) const {
   std::vector<blink::WebScriptSource> sources;
   if (!script_)
     return sources;
 
   DCHECK_EQ(script_->run_location(), run_location);
 
   const UserScript::FileList& js_scripts = script_->js_scripts();
 

[Devlin, 2016/08/18 17:08:16]

sources.reserve()?  (was this done in your other patch and needs to be rebased?

[lazyboy, 2016/08/18 18:53:23]

Done, thanks.
No, this wasn't done on my other CL.

   for (UserScript::FileList::const_iterator iter = js_scripts.begin();
        iter != js_scripts.end();
        ++iter) {
-    std::string content = iter->GetContent().as_string();
-
-    // We add this dumb function wrapper for user scripts to emulate what
-    // Greasemonkey does.
+    base::StringPiece script_content = iter->GetContent();
     if (script_->emulate_greasemonkey()) {
-      content.insert(0, kUserScriptHead);
-      content += kUserScriptTail;
+      // We add this dumb function wrapper for user scripts to emulate what
+      // Greasemonkey does: |script_content| becomes:

[Devlin, 2016/08/18 17:08:16]

nit: replace the first ':' (after 'does') with a '.'.

[lazyboy, 2016/08/18 18:53:23]

Done.

+      // concat(kUserScriptHead, script_content, kUserScriptTail)
+      std::string content;
+      content.reserve(strlen(kUserScriptHead) + content.length() +
+                      strlen(kUserScriptTail));
+      content.append(kUserScriptHead);
+      script_content.AppendToString(&content);
+      content.append(kUserScriptTail);
+      sources.push_back(blink::WebScriptSource(
+          blink::WebString::fromUTF8(content), iter->url()));
+    } else {
+      sources.push_back(blink::WebScriptSource(

[Devlin, 2016/08/18 17:08:16]

We should keep some kind of TODO here to optimize this yet more.

[lazyboy, 2016/08/18 18:53:23]

Done.

+          blink::WebString::fromUTF8(script_content.data(),

[Devlin, 2016/08/18 17:08:16]

hmm... I find it slightly more readable when we reuse the construction of the
WebScriptSource and appending to sources, i.e.

blink::WebString source;
if (greasemonkey) {
  std::string content;
  ...
  source = blink::WebString::fromUTF8(content);
} else {
  source = blink::WebString::fromUTF8(script_content.data(),
script_content.lenght());
}
sources.push_back(blink::WebScriptSource(source, iter->url()));

But that's just me, and I don't feel super strongly.

[lazyboy, 2016/08/18 18:53:23]

Done.

+                                     script_content.length()),
+          iter->url()));
     }
-    sources.push_back(blink::WebScriptSource(
-        blink::WebString::fromUTF8(content), iter->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(
+std::vector<blink::WebString> UserScriptInjector::GetCssSources(
     UserScript::RunLocation run_location) const {
   DCHECK_EQ(UserScript::DOCUMENT_START, run_location);
 
-  std::vector<std::string> sources;
+  std::vector<blink::WebString> sources;
   if (!script_)
     return sources;
 
   const UserScript::FileList& css_scripts = script_->css_scripts();
+  sources.reserve(css_scripts.size());
   for (UserScript::FileList::const_iterator iter = css_scripts.begin();
        iter != css_scripts.end();
        ++iter) {
-    sources.push_back(iter->GetContent().as_string());
+    base::StringPiece css_content = iter->GetContent();
+    sources.push_back(
+        blink::WebString::fromUTF8(css_content.data(), css_content.length()));
   }
   return sources;
 }
 
 void UserScriptInjector::GetRunInfo(
     ScriptsRunInfo* scripts_run_info,
     UserScript::RunLocation run_location) const {
   if (!script_)
     return;
 
@@ skipping 15 matching lines @@
 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