diff options
| author | scr@chromium.org <scr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 01:55:46 +0000 |
|---|---|---|
| committer | scr@chromium.org <scr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 01:55:46 +0000 |
| commit | cd3262460c8c161084d08abacf6e524220bad006 (patch) | |
| tree | 5fc2fe563e3a4befbfc6c4cb76fd1854e1164ebc /content/renderer | |
| parent | efa02ecf2250b303f452dd51881bf53af3b696f8 (diff) | |
| download | chromium_src-cd3262460c8c161084d08abacf6e524220bad006.zip chromium_src-cd3262460c8c161084d08abacf6e524220bad006.tar.gz chromium_src-cd3262460c8c161084d08abacf6e524220bad006.tar.bz2 | |
Use the ExecuteJavascriptInWebFrameNotifyResult to return results rather than domui.
Also fixes the hanging issue by allowing result to returned always even when javascript to be executed is bogus.
BUG=86074,85990
R=dtseng@chromium.org
TEST=browser_tests --gtest_filter=WebUIBrowserTest.*
Review URL: http://codereview.chromium.org/7146024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/render_view.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc index 2def6db..fc83a1d 100644 --- a/content/renderer/render_view.cc +++ b/content/renderer/render_view.cc @@ -3279,7 +3279,7 @@ void RenderView::EvaluateScript(const string16& frame_xpath, result = web_frame->executeScriptAndReturnValue(WebScriptSource(script)); if (notify_result) { ListValue list; - if (web_frame) { + if (!result.IsEmpty() && web_frame) { v8::HandleScope handle_scope; v8::Local<v8::Context> context = web_frame->mainWorldScriptContext(); v8::Context::Scope context_scope(context); |