Add default fonts for extensions

extensions/renderer/dispatcher.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/dispatcher.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 278 matching lines @@
   // lazily evalulate to Event from event_bindings.js. For extensions only
   // though, not all webpages!
   if (context->extension()) {
     v8::Handle<v8::Object> chrome = AsObjectOrEmpty(GetOrCreateChrome(context));
     if (!chrome.IsEmpty())
       module_system->SetLazyField(chrome, "Event", kEventBindings, "Event");
   }
 
   UpdateBindingsForContext(context);
 
-  bool is_within_platform_app = IsWithinPlatformApp();
+  bool is_within_platform_app = IsWithinPlatformApp(frame);
   // Inject custom JS into the platform app context.
   if (is_within_platform_app) {
     module_system->Require("platformApp");
   }
 
   delegate_->RequireAdditionalModules(
       module_system, extension, context_type, is_within_platform_app);
 
   VLOG(1) << "Num tracked contexts: " << script_context_set_.size();
 }
 
 void Dispatcher::WillReleaseScriptContext(
     WebFrame* frame,
     const v8::Handle<v8::Context>& v8_context,
     int world_id) {
   ScriptContext* context = script_context_set_.GetByV8Context(v8_context);
   if (!context)
     return;
 
   context->DispatchOnUnloadEvent();
   // TODO(kalman): add an invalidation observer interface to ScriptContext.
   request_sender_->InvalidateSource(context);
 
   script_context_set_.Remove(context);
   VLOG(1) << "Num tracked contexts: " << script_context_set_.size();
 }
 
 void Dispatcher::DidCreateDocumentElement(blink::WebFrame* frame) {
-  if (IsWithinPlatformApp()) {
-    // WebKit doesn't let us define an additional user agent stylesheet, so we
-    // insert the default platform app stylesheet into all documents that are
-    // loaded in each app.
-    std::string stylesheet = ResourceBundle::GetSharedInstance()
-                                 .GetRawDataResource(IDR_PLATFORM_APP_CSS)
-                                 .as_string();
+  if (IsWithinPlatformApp(frame) || IsWithinExtension(frame)) {
+    std::string stylesheet;
+    if (IsWithinPlatformApp(frame)) {
+      // WebKit doesn't let us define an additional user agent stylesheet, so we
+      // insert the default platform app stylesheet into all documents that are
+      // loaded in each app.
+      stylesheet = ResourceBundle::GetSharedInstance()
+                       .GetRawDataResource(IDR_PLATFORM_APP_CSS)
+                       .as_string();
+    } else if (IsWithinExtension(frame)) {
+      stylesheet = ResourceBundle::GetSharedInstance()
+                       .GetRawDataResource(IDR_EXTENSION_CSS)
+                       .as_string();
+    }
     ReplaceFirstSubstringAfterOffset(
         &stylesheet, 0, "$FONTFAMILY", system_font_family_);
     ReplaceFirstSubstringAfterOffset(
         &stylesheet, 0, "$FONTSIZE", system_font_size_);
     frame->document().insertStyleSheet(WebString::fromUTF8(stylesheet));
   }
-
   content_watcher_->DidCreateDocumentElement(frame);
 }
 
 void Dispatcher::DidMatchCSS(
     blink::WebFrame* frame,
     const blink::WebVector<blink::WebString>& newly_matching_selectors,
     const blink::WebVector<blink::WebString>& stopped_matching_selectors) {
   content_watcher_->DidMatchCSS(
       frame, newly_matching_selectors, stopped_matching_selectors);
 }
@@ skipping 698 matching lines @@
 
   // Custom types sources.
   source_map_.RegisterSource("StorageArea", IDR_STORAGE_AREA_JS);
 
   // Platform app sources that are not API-specific..
   source_map_.RegisterSource("platformApp", IDR_PLATFORM_APP_JS);
 
   delegate_->PopulateSourceMap(&source_map_);
 }
 
-bool Dispatcher::IsWithinPlatformApp() {
+bool Dispatcher::IsWithinPlatformApp(blink::WebFrame* frame) {

[not at google - send to devlin, 2014/07/19 01:54:16]

sorry I didn't meant to imply that we modify IsWithinPlatformApp[*]. I meant
that we shouldn't use it in DidCreateDocumentElement, and we shouldn't even need
to add IsWithinExtension.


[*] though it *does* look suspicious.

   for (std::set<std::string>::iterator iter = active_extension_ids_.begin();
        iter != active_extension_ids_.end();
        ++iter) {
-    const Extension* extension = extensions_.GetByID(*iter);
+    // Note: use GetEffectiveDocumentURL not just frame->document()->url()
+    // so that this also injects the stylesheet on about:blank frames that
+    // are hosted in the extension process.
+    GURL effective_document_url = ScriptContext::GetEffectiveDocumentURL(
+        frame, frame->document().url(), true /* match_about_blank */);
+    const Extension* extension =
+        extensions_.GetExtensionOrAppByURL(effective_document_url);
     if (extension && extension->is_platform_app())
       return true;
   }
   return false;
 }
 
+bool Dispatcher::IsWithinExtension(blink::WebFrame* frame) {
+  for (std::set<std::string>::iterator iter = active_extension_ids_.begin();
+       iter != active_extension_ids_.end();
+       ++iter) {
+    // Note: use GetEffectiveDocumentURL not just frame->document()->url()
+    // so that this also injects the stylesheet on about:blank frames that
+    // are hosted in the extension process.
+    GURL effective_document_url = ScriptContext::GetEffectiveDocumentURL(
+        frame, frame->document().url(), true /* match_about_blank */);
+    const Extension* extension =
+        extensions_.GetExtensionOrAppByURL(effective_document_url);
+    if (extension && extension->is_extension())
+      return true;
+  }
+  return false;
+}
+
 // TODO(kalman): This is checking for the wrong thing, it should be checking if
 // the frame's security origin is unique. The extension sandbox directive is
 // checked for in extensions/common/manifest_handlers/csp_info.cc.
 bool Dispatcher::IsSandboxedPage(const GURL& url) const {
   if (url.SchemeIs(kExtensionScheme)) {
     const Extension* extension = extensions_.GetByID(url.host());
     if (extension) {
       return SandboxedPageInfo::IsSandboxedPage(extension, url.path());
     }
   }
@@ skipping 116 matching lines @@
     return v8::Handle<v8::Object>();
 
   if (bind_name)
     *bind_name = split.back();
 
   return bind_object.IsEmpty() ? AsObjectOrEmpty(GetOrCreateChrome(context))
                                : bind_object;
 }
 
 }  // namespace extensions