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

Unified Diff: webkit/glue/webframe_impl.cc

Issue 155626: Enable isolated worlds for content scripts.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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
Index: webkit/glue/webframe_impl.cc
===================================================================
--- webkit/glue/webframe_impl.cc (revision 20764)
+++ webkit/glue/webframe_impl.cc (working copy)
@@ -1604,12 +1604,23 @@
sources_in[i].startLine));
}
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kIsolatedWorld))
- frame_->script()->evaluateInNewWorld(sources);
- else
- frame_->script()->evaluateInNewContext(sources);
+ frame_->script()->evaluateInNewContext(sources);
}
+void WebFrameImpl::ExecuteScriptInNewWorld(
+ const WebScriptSource* sources_in, int num_sources) {
+ Vector<WebCore::ScriptSourceCode> sources;
+
+ for (int i = 0; i < num_sources; ++i) {
+ sources.append(WebCore::ScriptSourceCode(
+ webkit_glue::WebStringToString(sources_in[i].code),
+ webkit_glue::WebURLToKURL(sources_in[i].url),
+ sources_in[i].startLine));
+ }
+
+ frame_->script()->evaluateInNewWorld(sources);
+}
+
std::wstring WebFrameImpl::GetName() {
return webkit_glue::StringToStdWString(frame_->tree()->name());
}

Powered by Google App Engine
This is Rietveld 408576698