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

Unified Diff: webkit/glue/webframe_impl.cc

Issue 262002: Make all content scripts from an extension run in the same (Closed)
Patch Set: Created 11 years, 2 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 | « webkit/glue/webframe_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webframe_impl.cc
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 092bfc03adab1ca7c632bee8c7be314119ad4f8c..731db42c58eda8e6bea855880cd42f2306ec5b26 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -628,8 +628,8 @@ void WebFrameImpl::executeScriptInNewContext(
frame_->script()->evaluateInNewContext(sources, extension_group);
}
-void WebFrameImpl::executeScriptInNewWorld(
- const WebScriptSource* sources_in, unsigned num_sources,
+void WebFrameImpl::executeScriptInIsolatedWorld(
+ int world_id, const WebScriptSource* sources_in, unsigned num_sources,
int extension_group) {
Vector<WebCore::ScriptSourceCode> sources;
@@ -640,7 +640,7 @@ void WebFrameImpl::executeScriptInNewWorld(
sources_in[i].startLine));
}
- frame_->script()->evaluateInNewWorld(sources, extension_group);
+ frame_->script()->evaluateInIsolatedWorld(world_id, sources, extension_group);
}
void WebFrameImpl::addMessageToConsole(const WebConsoleMessage& message) {
« no previous file with comments | « webkit/glue/webframe_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698