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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2628053003: Remove extension group from DOMWrapperWorld. (Closed)
Patch Set: Fix GCCallbackTest Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 120d55863df289c3d50cb2dcb642b2302a31b5b3..16517fdf7363993f4ad291ae27cc768ea8cd051c 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1996,7 +1996,7 @@ void RenderFrameImpl::OnJavaScriptExecuteRequestInIsolatedWorld(
WebScriptSource script = WebScriptSource(jscript);
JavaScriptIsolatedWorldRequest* request = new JavaScriptIsolatedWorldRequest(
id, notify_result, routing_id_, weak_factory_.GetWeakPtr());
- frame_->requestExecuteScriptInIsolatedWorld(world_id, &script, 1, 0, false,
+ frame_->requestExecuteScriptInIsolatedWorld(world_id, &script, 1, false,
request);
}
@@ -4458,12 +4458,11 @@ void RenderFrameImpl::didObserveLoadingBehavior(
void RenderFrameImpl::didCreateScriptContext(blink::WebLocalFrame* frame,
v8::Local<v8::Context> context,
- int extension_group,
int world_id) {
DCHECK_EQ(frame_, frame);
for (auto& observer : observers_)
- observer.DidCreateScriptContext(context, extension_group, world_id);
+ observer.DidCreateScriptContext(context, world_id);
}
void RenderFrameImpl::willReleaseScriptContext(blink::WebLocalFrame* frame,
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698