diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 01:52:56 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 01:52:56 +0000 |
| commit | 146486ff9a39e4d323df0e60e891e33a1e8d8390 (patch) | |
| tree | f61da72a65c5c94807b639a6c88b7d8b4369dfb2 /webkit/glue | |
| parent | a74efa3f82f1ce5ed2d61cfc1ac22410355eb32f (diff) | |
| download | chromium_src-146486ff9a39e4d323df0e60e891e33a1e8d8390.zip chromium_src-146486ff9a39e4d323df0e60e891e33a1e8d8390.tar.gz chromium_src-146486ff9a39e4d323df0e60e891e33a1e8d8390.tar.bz2 | |
Make all content scripts from an extension run in the same
isolated world. Chromium side of change.
Review URL: http://codereview.chromium.org/262002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 6 | ||||
| -rw-r--r-- | webkit/glue/webframe_impl.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 7fd7ce9..511a238 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) { diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h index b4cff81..f840df4 100644 --- a/webkit/glue/webframe_impl.h +++ b/webkit/glue/webframe_impl.h @@ -99,9 +99,9 @@ class WebFrameImpl : public WebKit::WebFrame, public RefCounted<WebFrameImpl> { virtual void executeScriptInNewContext( const WebKit::WebScriptSource* sources, unsigned num_sources, int extension_group); - virtual void executeScriptInNewWorld( - const WebKit::WebScriptSource* sources, unsigned num_sources, - int extension_group); + virtual void executeScriptInIsolatedWorld( + int world_id, const WebKit::WebScriptSource* sources, + unsigned num_sources, int extension_group); virtual void addMessageToConsole(const WebKit::WebConsoleMessage&); virtual void collectGarbage(); #if WEBKIT_USING_V8 |