diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-09 16:17:26 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-09 16:17:26 +0000 |
| commit | 2227422a7ddc1bdd9d6f37644a4d3da8fcea087c (patch) | |
| tree | 0f9bcd5d1d3c31265c1be622830bee408d9a708e /webkit/glue/webframe_impl.cc | |
| parent | 6ffe2b3e99350dcdaf950dc7111165548c5e3635 (diff) | |
| download | chromium_src-2227422a7ddc1bdd9d6f37644a4d3da8fcea087c.zip chromium_src-2227422a7ddc1bdd9d6f37644a4d3da8fcea087c.tar.gz chromium_src-2227422a7ddc1bdd9d6f37644a4d3da8fcea087c.tar.bz2 | |
Revert unintentional change.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframe_impl.cc')
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 7ec990a..c941f91 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -1613,11 +1613,10 @@ void WebFrameImpl::ExecuteScriptInNewContext( sources_in[i].startLine)); } - // OOPS! Do not check in. - // if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kIsolatedWorld)) - frame_->script()->evaluateInNewWorld(sources); - // else - // frame_->script()->evaluateInNewContext(sources); + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kIsolatedWorld)) + frame_->script()->evaluateInNewWorld(sources); + else + frame_->script()->evaluateInNewContext(sources); } std::wstring WebFrameImpl::GetName() { |