Declarative content scripts: Renderer-side: per-extension shared memory regions (lazily loaded)

extensions/renderer/user_script_set.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_set.h"
 
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_thread.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
@@ skipping 18 matching lines @@
                            data_source_url.spec());
   }
 
   return data_source_url;
 }
 
 }  // namespace
 
 UserScriptSet::UserScriptSet(const ExtensionSet* extensions)
     : extensions_(extensions) {
-  content::RenderThread::Get()->AddObserver(this);
 }
 
 UserScriptSet::~UserScriptSet() {
 }
 
 void UserScriptSet::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void UserScriptSet::RemoveObserver(Observer* observer) {
@@ skipping 22 matching lines @@
     const Extension* extension = extensions_->GetByID((*iter)->extension_id());
     if (!extension)
       continue;
     scoped_ptr<ScriptInjection> injection = GetInjectionForScript(
         *iter, web_frame, tab_id, run_location, document_url, extension);
     if (injection.get())
       injections->push_back(injection.release());
   }
 }
 
-bool UserScriptSet::OnControlMessageReceived(
-    const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(UserScriptSet, message)
-    IPC_MESSAGE_HANDLER(ExtensionMsg_UpdateUserScripts, OnUpdateUserScripts)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
-void UserScriptSet::OnUpdateUserScripts(
+bool UserScriptSet::OnUpdateUserScripts(
     base::SharedMemoryHandle shared_memory,
     const std::set<std::string>& changed_extensions) {
   if (!base::SharedMemory::IsHandleValid(shared_memory)) {
     NOTREACHED() << "Bad scripts handle";
-    return;
+    return false;
   }
 
   for (std::set<std::string>::const_iterator iter = changed_extensions.begin();
        iter != changed_extensions.end();
        ++iter) {
     if (!Extension::IdIsValid(*iter)) {
       NOTREACHED() << "Invalid extension id: " << *iter;
-      return;
+      return false;
     }
   }
 
-  if (UpdateScripts(shared_memory)) {
-    FOR_EACH_OBSERVER(Observer,
-                      observers_,
-                      OnUserScriptsUpdated(changed_extensions, scripts_.get()));
+  if (!UpdateScripts(shared_memory)) {

[Devlin, 2014/07/28 18:15:27]

nit: no brackets on single-line ifs.

[Mark Dittmer, 2014/07/28 22:21:28]

Done.

+    return false;
   }
+
+  FOR_EACH_OBSERVER(Observer,
+                    observers_,
+                    OnUserScriptsUpdated(changed_extensions, scripts_.get()));

[Jeffrey Yasskin, 2014/07/28 17:47:16]

I wonder if it'll make sense to remove OnUserScriptsUpdated from UserScriptSet
entirely, in favor of observing the UserScriptSetManager. No need in this patch.

[Mark Dittmer, 2014/07/28 22:21:28]

Acknowledged.

+  return true;
 }
 
 bool UserScriptSet::UpdateScripts(
     base::SharedMemoryHandle shared_memory) {
   bool only_inject_incognito =
       ExtensionsRendererClient::Get()->IsIncognitoProcess();
 
   // Create the shared memory object (read only).
   shared_memory_.reset(new base::SharedMemory(shared_memory, true));
   if (!shared_memory_.get())
@@ skipping 86 matching lines @@
         scoped_ptr<ScriptInjector>(new UserScriptInjector(script, this)),
         web_frame,
         extension->id(),
         run_location,
         tab_id));
   }
   return injection.Pass();
 }
 
 }  // namespace extensions