Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(465)

Side by Side Diff: extensions/renderer/script_injection.cc

Issue 885493007: Refactoring: de-couple Extensions from "script injection System" [render side] : 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « extensions/renderer/script_injection.h ('k') | extensions/renderer/script_injection_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/renderer/script_injection.h" 5 #include "extensions/renderer/script_injection.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
11 #include "base/timer/elapsed_timer.h" 11 #include "base/timer/elapsed_timer.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "content/public/child/v8_value_converter.h" 13 #include "content/public/child/v8_value_converter.h"
14 #include "content/public/renderer/render_view.h" 14 #include "content/public/renderer/render_view.h"
15 #include "extensions/common/extension.h"
16 #include "extensions/common/extension_messages.h" 15 #include "extensions/common/extension_messages.h"
17 #include "extensions/common/feature_switch.h" 16 #include "extensions/common/feature_switch.h"
17 #include "extensions/common/host_id.h"
18 #include "extensions/common/manifest_handlers/csp_info.h" 18 #include "extensions/common/manifest_handlers/csp_info.h"
19 #include "extensions/renderer/dom_activity_logger.h" 19 #include "extensions/renderer/dom_activity_logger.h"
20 #include "extensions/renderer/extension_groups.h" 20 #include "extensions/renderer/extension_groups.h"
21 #include "extensions/renderer/extension_injection_host.h"
21 #include "extensions/renderer/extensions_renderer_client.h" 22 #include "extensions/renderer/extensions_renderer_client.h"
22 #include "third_party/WebKit/public/platform/WebString.h" 23 #include "third_party/WebKit/public/platform/WebString.h"
23 #include "third_party/WebKit/public/web/WebDocument.h" 24 #include "third_party/WebKit/public/web/WebDocument.h"
24 #include "third_party/WebKit/public/web/WebLocalFrame.h" 25 #include "third_party/WebKit/public/web/WebLocalFrame.h"
25 #include "third_party/WebKit/public/web/WebScopedUserGesture.h" 26 #include "third_party/WebKit/public/web/WebScopedUserGesture.h"
26 #include "third_party/WebKit/public/web/WebScriptSource.h" 27 #include "third_party/WebKit/public/web/WebScriptSource.h"
27 #include "third_party/WebKit/public/web/WebSecurityOrigin.h" 28 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
28 #include "url/gurl.h" 29 #include "url/gurl.h"
29 30
30 namespace extensions { 31 namespace extensions {
31 32
32 namespace { 33 namespace {
33 34
34 typedef std::map<std::string, int> IsolatedWorldMap; 35 using IsolatedWorldMap = std::map<std::string, int>;
35 base::LazyInstance<IsolatedWorldMap> g_isolated_worlds = 36 base::LazyInstance<IsolatedWorldMap> g_isolated_worlds =
36 LAZY_INSTANCE_INITIALIZER; 37 LAZY_INSTANCE_INITIALIZER;
37 38
38 const int64 kInvalidRequestId = -1; 39 const int64 kInvalidRequestId = -1;
39 40
40 // The id of the next pending injection. 41 // The id of the next pending injection.
41 int64 g_next_pending_id = 0; 42 int64 g_next_pending_id = 0;
42 43
43 bool ShouldNotifyBrowserOfInjections() { 44 bool ShouldNotifyBrowserOfInjections() {
44 return !FeatureSwitch::scripts_require_action()->IsEnabled(); 45 return !FeatureSwitch::scripts_require_action()->IsEnabled();
45 } 46 }
46 47
47 // Append all the child frames of |parent_frame| to |frames_vector|. 48 // Append all the child frames of |parent_frame| to |frames_vector|.
48 void AppendAllChildFrames(blink::WebFrame* parent_frame, 49 void AppendAllChildFrames(blink::WebFrame* parent_frame,
49 std::vector<blink::WebFrame*>* frames_vector) { 50 std::vector<blink::WebFrame*>* frames_vector) {
50 DCHECK(parent_frame); 51 DCHECK(parent_frame);
51 for (blink::WebFrame* child_frame = parent_frame->firstChild(); child_frame; 52 for (blink::WebFrame* child_frame = parent_frame->firstChild(); child_frame;
52 child_frame = child_frame->nextSibling()) { 53 child_frame = child_frame->nextSibling()) {
53 frames_vector->push_back(child_frame); 54 frames_vector->push_back(child_frame);
54 AppendAllChildFrames(child_frame, frames_vector); 55 AppendAllChildFrames(child_frame, frames_vector);
55 } 56 }
56 } 57 }
57 58
58 // Gets the isolated world ID to use for the given |extension| in the given 59 // Gets the isolated world ID to use for the given |injection_host|
59 // |frame|. If no isolated world has been created for that extension, 60 // in the given |frame|. If no isolated world has been created for that
60 // one will be created and initialized. 61 // |injection_host| one will be created and initialized.
61 int GetIsolatedWorldIdForExtension(const Extension* extension, 62 int GetIsolatedWorldIdForInstance(const InjectionHost* injection_host,
62 blink::WebLocalFrame* frame) { 63 blink::WebLocalFrame* frame) {
63 static int g_next_isolated_world_id = 64 static int g_next_isolated_world_id =
64 ExtensionsRendererClient::Get()->GetLowestIsolatedWorldId(); 65 ExtensionsRendererClient::Get()->GetLowestIsolatedWorldId();
65 66
66 IsolatedWorldMap& isolated_worlds = g_isolated_worlds.Get(); 67 IsolatedWorldMap& isolated_worlds = g_isolated_worlds.Get();
67 68
68 int id = 0; 69 int id = 0;
69 IsolatedWorldMap::iterator iter = isolated_worlds.find(extension->id()); 70 const std::string& key = injection_host->id().id();
71 IsolatedWorldMap::iterator iter = isolated_worlds.find(key);
70 if (iter != isolated_worlds.end()) { 72 if (iter != isolated_worlds.end()) {
71 id = iter->second; 73 id = iter->second;
72 } else { 74 } else {
73 id = g_next_isolated_world_id++; 75 id = g_next_isolated_world_id++;
74 // This map will tend to pile up over time, but realistically, you're never 76 // This map will tend to pile up over time, but realistically, you're never
75 // going to have enough extensions for it to matter. 77 // going to have enough injection hosts for it to matter.
76 isolated_worlds[extension->id()] = id; 78 isolated_worlds[key] = id;
77 } 79 }
78 80
79 // We need to set the isolated world origin and CSP even if it's not a new 81 // We need to set the isolated world origin and CSP even if it's not a new
80 // world since these are stored per frame, and we might not have used this 82 // world since these are stored per frame, and we might not have used this
81 // isolated world in this frame before. 83 // isolated world in this frame before.
82 frame->setIsolatedWorldSecurityOrigin( 84 frame->setIsolatedWorldSecurityOrigin(
83 id, blink::WebSecurityOrigin::create(extension->url())); 85 id, blink::WebSecurityOrigin::create(injection_host->url()));
84 frame->setIsolatedWorldContentSecurityPolicy( 86 frame->setIsolatedWorldContentSecurityPolicy(
85 id, 87 id, blink::WebString::fromUTF8(
86 blink::WebString::fromUTF8(CSPInfo::GetContentSecurityPolicy(extension))); 88 injection_host->GetContentSecurityPolicy()));
87 frame->setIsolatedWorldHumanReadableName( 89 frame->setIsolatedWorldHumanReadableName(
88 id, 90 id, blink::WebString::fromUTF8(injection_host->name()));
89 blink::WebString::fromUTF8(extension->name()));
90 91
91 return id; 92 return id;
92 } 93 }
93 94
94 } // namespace 95 } // namespace
95 96
96 // static 97 // static
97 std::string ScriptInjection::GetExtensionIdForIsolatedWorld( 98 std::string ScriptInjection::GetHostIdForIsolatedWorld(int isolated_world_id) {
98 int isolated_world_id) { 99 const IsolatedWorldMap& isolated_worlds = g_isolated_worlds.Get();
99 IsolatedWorldMap& isolated_worlds = g_isolated_worlds.Get();
100 100
101 for (IsolatedWorldMap::iterator iter = isolated_worlds.begin(); 101 for (const auto& iter : isolated_worlds) {
102 iter != isolated_worlds.end(); 102 if (iter.second == isolated_world_id)
103 ++iter) { 103 return iter.first;
104 if (iter->second == isolated_world_id)
105 return iter->first;
106 } 104 }
107 return std::string(); 105 return std::string();
108 } 106 }
109 107
110 // static 108 // static
111 void ScriptInjection::RemoveIsolatedWorld(const std::string& extension_id) { 109 void ScriptInjection::RemoveIsolatedWorld(const std::string& host_id) {
112 g_isolated_worlds.Get().erase(extension_id); 110 g_isolated_worlds.Get().erase(host_id);
113 } 111 }
114 112
115 ScriptInjection::ScriptInjection( 113 ScriptInjection::ScriptInjection(
116 scoped_ptr<ScriptInjector> injector, 114 scoped_ptr<ScriptInjector> injector,
117 blink::WebLocalFrame* web_frame, 115 blink::WebLocalFrame* web_frame,
118 const std::string& extension_id, 116 const HostID& host_id,
119 UserScript::RunLocation run_location, 117 UserScript::RunLocation run_location,
120 int tab_id) 118 int tab_id)
121 : injector_(injector.Pass()), 119 : injector_(injector.Pass()),
122 web_frame_(web_frame), 120 web_frame_(web_frame),
123 extension_id_(extension_id), 121 host_id_(host_id),
124 run_location_(run_location), 122 run_location_(run_location),
125 tab_id_(tab_id), 123 tab_id_(tab_id),
126 request_id_(kInvalidRequestId), 124 request_id_(kInvalidRequestId),
127 complete_(false) { 125 complete_(false) {
128 } 126 }
129 127
130 ScriptInjection::~ScriptInjection() { 128 ScriptInjection::~ScriptInjection() {
131 if (!complete_) 129 if (!complete_)
132 injector_->OnWillNotInject(ScriptInjector::WONT_INJECT); 130 injector_->OnWillNotInject(ScriptInjector::WONT_INJECT);
133 } 131 }
134 132
135 bool ScriptInjection::TryToInject(UserScript::RunLocation current_location, 133 bool ScriptInjection::TryToInject(UserScript::RunLocation current_location,
136 const Extension* extension, 134 const InjectionHost* injection_host,
137 ScriptsRunInfo* scripts_run_info) { 135 ScriptsRunInfo* scripts_run_info) {
138 if (current_location < run_location_) 136 if (current_location < run_location_)
139 return false; // Wait for the right location. 137 return false; // Wait for the right location.
140 138
141 if (request_id_ != kInvalidRequestId) 139 if (request_id_ != kInvalidRequestId)
142 return false; // We're waiting for permission right now, try again later. 140 return false; // We're waiting for permission right now, try again later.
143 141
144 if (!extension) { 142 if (!injection_host) {
145 NotifyWillNotInject(ScriptInjector::EXTENSION_REMOVED); 143 NotifyWillNotInject(ScriptInjector::EXTENSION_REMOVED);
146 return true; // We're done. 144 return true; // We're done.
147 } 145 }
148 146
149 switch (injector_->CanExecuteOnFrame( 147 switch (injector_->CanExecuteOnFrame(injection_host, web_frame_, tab_id_,
150 extension, web_frame_, tab_id_, web_frame_->top()->document().url())) { 148 web_frame_->top()->document().url())) {
151 case PermissionsData::ACCESS_DENIED: 149 case PermissionsData::ACCESS_DENIED:
152 NotifyWillNotInject(ScriptInjector::NOT_ALLOWED); 150 NotifyWillNotInject(ScriptInjector::NOT_ALLOWED);
153 return true; // We're done. 151 return true; // We're done.
154 case PermissionsData::ACCESS_WITHHELD: 152 case PermissionsData::ACCESS_WITHHELD:
155 RequestPermission(); 153 RequestPermission();
156 return false; // Wait around for permission. 154 return false; // Wait around for permission.
157 case PermissionsData::ACCESS_ALLOWED: 155 case PermissionsData::ACCESS_ALLOWED:
158 Inject(extension, scripts_run_info); 156 Inject(injection_host, scripts_run_info);
159 return true; // We're done! 157 return true; // We're done!
160 } 158 }
161 159
162 // Some compilers don't realize that we always return from the switch() above. 160 // Some compilers don't realize that we always return from the switch() above.
163 // Make them happy. 161 // Make them happy.
164 return false; 162 return false;
165 } 163 }
166 164
167 bool ScriptInjection::OnPermissionGranted(const Extension* extension, 165 bool ScriptInjection::OnPermissionGranted(const InjectionHost* injection_host,
168 ScriptsRunInfo* scripts_run_info) { 166 ScriptsRunInfo* scripts_run_info) {
169 if (!extension) { 167 if (!injection_host) {
170 NotifyWillNotInject(ScriptInjector::EXTENSION_REMOVED); 168 NotifyWillNotInject(ScriptInjector::EXTENSION_REMOVED);
171 return false; 169 return false;
172 } 170 }
173 171
174 Inject(extension, scripts_run_info); 172 Inject(injection_host, scripts_run_info);
175 return true; 173 return true;
176 } 174 }
177 175
178 void ScriptInjection::RequestPermission() { 176 void ScriptInjection::RequestPermission() {
179 content::RenderView* render_view = 177 content::RenderView* render_view =
180 content::RenderView::FromWebView(web_frame()->top()->view()); 178 content::RenderView::FromWebView(web_frame()->top()->view());
181 179
182 // If we are just notifying the browser of the injection, then send an 180 // If we are just notifying the browser of the injection, then send an
183 // invalid request (which is treated like a notification). 181 // invalid request (which is treated like a notification).
184 request_id_ = ShouldNotifyBrowserOfInjections() ? kInvalidRequestId 182 request_id_ = ShouldNotifyBrowserOfInjections() ? kInvalidRequestId
185 : g_next_pending_id++; 183 : g_next_pending_id++;
186 render_view->Send(new ExtensionHostMsg_RequestScriptInjectionPermission( 184 render_view->Send(new ExtensionHostMsg_RequestScriptInjectionPermission(
187 render_view->GetRoutingID(), 185 render_view->GetRoutingID(),
188 extension_id_, 186 host_id_.id(),
189 injector_->script_type(), 187 injector_->script_type(),
190 request_id_)); 188 request_id_));
191 } 189 }
192 190
193 void ScriptInjection::NotifyWillNotInject( 191 void ScriptInjection::NotifyWillNotInject(
194 ScriptInjector::InjectFailureReason reason) { 192 ScriptInjector::InjectFailureReason reason) {
195 complete_ = true; 193 complete_ = true;
196 injector_->OnWillNotInject(reason); 194 injector_->OnWillNotInject(reason);
197 } 195 }
198 196
199 void ScriptInjection::Inject(const Extension* extension, 197 void ScriptInjection::Inject(const InjectionHost* injection_host,
200 ScriptsRunInfo* scripts_run_info) { 198 ScriptsRunInfo* scripts_run_info) {
201 DCHECK(extension); 199 DCHECK(injection_host);
202 DCHECK(scripts_run_info); 200 DCHECK(scripts_run_info);
203 DCHECK(!complete_); 201 DCHECK(!complete_);
204 202
205 if (ShouldNotifyBrowserOfInjections()) 203 if (ShouldNotifyBrowserOfInjections() &&
204 injection_host->id().type() == HostID::EXTENSIONS)
206 RequestPermission(); 205 RequestPermission();
207 206
208 std::vector<blink::WebFrame*> frame_vector; 207 std::vector<blink::WebFrame*> frame_vector;
209 frame_vector.push_back(web_frame_); 208 frame_vector.push_back(web_frame_);
210 if (injector_->ShouldExecuteInChildFrames()) 209 if (injector_->ShouldExecuteInChildFrames())
211 AppendAllChildFrames(web_frame_, &frame_vector); 210 AppendAllChildFrames(web_frame_, &frame_vector);
212 211
213 scoped_ptr<blink::WebScopedUserGesture> gesture; 212 scoped_ptr<blink::WebScopedUserGesture> gesture;
214 if (injector_->IsUserGesture()) 213 if (injector_->IsUserGesture())
215 gesture.reset(new blink::WebScopedUserGesture()); 214 gesture.reset(new blink::WebScopedUserGesture());
216 215
217 bool inject_js = injector_->ShouldInjectJs(run_location_); 216 bool inject_js = injector_->ShouldInjectJs(run_location_);
218 bool inject_css = injector_->ShouldInjectCss(run_location_); 217 bool inject_css = injector_->ShouldInjectCss(run_location_);
219 DCHECK(inject_js || inject_css); 218 DCHECK(inject_js || inject_css);
220 219
221 scoped_ptr<base::ListValue> execution_results(new base::ListValue()); 220 scoped_ptr<base::ListValue> execution_results(new base::ListValue());
222 GURL top_url = web_frame_->top()->document().url(); 221 GURL top_url = web_frame_->top()->document().url();
223 for (std::vector<blink::WebFrame*>::iterator iter = frame_vector.begin(); 222 for (std::vector<blink::WebFrame*>::iterator iter = frame_vector.begin();
224 iter != frame_vector.end(); 223 iter != frame_vector.end();
225 ++iter) { 224 ++iter) {
226 // TODO(dcheng): Unfortunately, the code as written won't work in an OOPI 225 // TODO(dcheng): Unfortunately, the code as written won't work in an OOPI
227 // world. This is just a temporary hack to make things compile. 226 // world. This is just a temporary hack to make things compile.
228 blink::WebLocalFrame* frame = (*iter)->toWebLocalFrame(); 227 blink::WebLocalFrame* frame = (*iter)->toWebLocalFrame();
229 228
230 // We recheck access here in the renderer for extra safety against races 229 // We recheck access here in the renderer for extra safety against races
231 // with navigation, but different frames can have different URLs, and the 230 // with navigation, but different frames can have different URLs, and the
232 // extension might only have access to a subset of them. 231 // injection host might only have access to a subset of them.
233 // For child frames, we just skip ones the extension doesn't have access 232 // For child frames, we just skip ones the injection host doesn't have
234 // to and carry on. 233 // access to and carry on.
235 // Note: we don't consider ACCESS_WITHHELD because there is nowhere to 234 // Note: we don't consider ACCESS_WITHHELD because there is nowhere to
236 // surface a request for a child frame. 235 // surface a request for a child frame.
237 // TODO(rdevlin.cronin): We should ask for permission somehow. 236 // TODO(rdevlin.cronin): We should ask for permission somehow.
238 if (injector_->CanExecuteOnFrame(extension, frame, tab_id_, top_url) == 237 if (injector_->CanExecuteOnFrame(injection_host, frame, tab_id_, top_url) ==
239 PermissionsData::ACCESS_DENIED) { 238 PermissionsData::ACCESS_DENIED) {
240 DCHECK(frame->parent()); 239 DCHECK(frame->parent());
241 continue; 240 continue;
242 } 241 }
243 if (inject_js) 242 if (inject_js)
244 InjectJs(extension, frame, execution_results.get()); 243 InjectJs(injection_host, frame, execution_results.get());
245 if (inject_css) 244 if (inject_css)
246 InjectCss(frame); 245 InjectCss(frame);
247 } 246 }
248 247
249 complete_ = true; 248 complete_ = true;
249
250 // TODO(hanxi): don't log these metrics for webUIs' injections.
250 injector_->OnInjectionComplete(execution_results.Pass(), 251 injector_->OnInjectionComplete(execution_results.Pass(),
251 scripts_run_info, 252 scripts_run_info,
252 run_location_); 253 run_location_);
253 } 254 }
254 255
255 void ScriptInjection::InjectJs(const Extension* extension, 256 void ScriptInjection::InjectJs(const InjectionHost* injection_host,
256 blink::WebLocalFrame* frame, 257 blink::WebLocalFrame* frame,
257 base::ListValue* execution_results) { 258 base::ListValue* execution_results) {
258 std::vector<blink::WebScriptSource> sources = 259 std::vector<blink::WebScriptSource> sources =
259 injector_->GetJsSources(run_location_); 260 injector_->GetJsSources(run_location_);
260 bool in_main_world = injector_->ShouldExecuteInMainWorld(); 261 bool in_main_world = injector_->ShouldExecuteInMainWorld();
261 int world_id = in_main_world 262 int world_id = in_main_world
262 ? DOMActivityLogger::kMainWorldId 263 ? DOMActivityLogger::kMainWorldId
263 : GetIsolatedWorldIdForExtension(extension, frame); 264 : GetIsolatedWorldIdForInstance(injection_host, frame);
264 bool expects_results = injector_->ExpectsResults(); 265 bool expects_results = injector_->ExpectsResults();
265 266
266 base::ElapsedTimer exec_timer; 267 base::ElapsedTimer exec_timer;
267 DOMActivityLogger::AttachToWorld(world_id, extension->id()); 268 if (injection_host->id().type() == HostID::EXTENSIONS)
269 DOMActivityLogger::AttachToWorld(world_id, injection_host->id().id());
268 v8::HandleScope scope(v8::Isolate::GetCurrent()); 270 v8::HandleScope scope(v8::Isolate::GetCurrent());
269 v8::Local<v8::Value> script_value; 271 v8::Local<v8::Value> script_value;
270 if (in_main_world) { 272 if (in_main_world) {
271 // We only inject in the main world for javascript: urls. 273 // We only inject in the main world for javascript: urls.
272 DCHECK_EQ(1u, sources.size()); 274 DCHECK_EQ(1u, sources.size());
273 275
274 const blink::WebScriptSource& source = sources.front(); 276 const blink::WebScriptSource& source = sources.front();
275 if (expects_results) 277 if (expects_results)
276 script_value = frame->executeScriptAndReturnValue(source); 278 script_value = frame->executeScriptAndReturnValue(source);
277 else 279 else
278 frame->executeScript(source); 280 frame->executeScript(source);
279 } else { // in isolated world 281 } else { // in isolated world
280 scoped_ptr<blink::WebVector<v8::Local<v8::Value> > > results; 282 scoped_ptr<blink::WebVector<v8::Local<v8::Value> > > results;
281 if (expects_results) 283 if (expects_results)
282 results.reset(new blink::WebVector<v8::Local<v8::Value> >()); 284 results.reset(new blink::WebVector<v8::Local<v8::Value> >());
283 frame->executeScriptInIsolatedWorld(world_id, 285 frame->executeScriptInIsolatedWorld(world_id,
284 &sources.front(), 286 &sources.front(),
285 sources.size(), 287 sources.size(),
286 EXTENSION_GROUP_CONTENT_SCRIPTS, 288 EXTENSION_GROUP_CONTENT_SCRIPTS,
287 results.get()); 289 results.get());
288 if (expects_results && !results->isEmpty()) 290 if (expects_results && !results->isEmpty())
289 script_value = (*results)[0]; 291 script_value = (*results)[0];
290 } 292 }
291 293
292 UMA_HISTOGRAM_TIMES("Extensions.InjectScriptTime", exec_timer.Elapsed()); 294 if (injection_host->id().type() == HostID::EXTENSIONS)
295 UMA_HISTOGRAM_TIMES("Extensions.InjectScriptTime", exec_timer.Elapsed());
293 296
294 if (expects_results) { 297 if (expects_results) {
295 // Right now, we only support returning single results (per frame). 298 // Right now, we only support returning single results (per frame).
296 scoped_ptr<content::V8ValueConverter> v8_converter( 299 scoped_ptr<content::V8ValueConverter> v8_converter(
297 content::V8ValueConverter::create()); 300 content::V8ValueConverter::create());
298 // It's safe to always use the main world context when converting 301 // It's safe to always use the main world context when converting
299 // here. V8ValueConverterImpl shouldn't actually care about the 302 // here. V8ValueConverterImpl shouldn't actually care about the
300 // context scope, and it switches to v8::Object's creation context 303 // context scope, and it switches to v8::Object's creation context
301 // when encountered. 304 // when encountered.
302 v8::Local<v8::Context> context = frame->mainWorldScriptContext(); 305 v8::Local<v8::Context> context = frame->mainWorldScriptContext();
(...skipping 10 matching lines...) Expand all
313 std::vector<std::string> css_sources = 316 std::vector<std::string> css_sources =
314 injector_->GetCssSources(run_location_); 317 injector_->GetCssSources(run_location_);
315 for (std::vector<std::string>::const_iterator iter = css_sources.begin(); 318 for (std::vector<std::string>::const_iterator iter = css_sources.begin();
316 iter != css_sources.end(); 319 iter != css_sources.end();
317 ++iter) { 320 ++iter) {
318 frame->document().insertStyleSheet(blink::WebString::fromUTF8(*iter)); 321 frame->document().insertStyleSheet(blink::WebString::fromUTF8(*iter));
319 } 322 }
320 } 323 }
321 324
322 } // namespace extensions 325 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/renderer/script_injection.h ('k') | extensions/renderer/script_injection_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698