content/renderer/render_view.cc - Issue 7146024: Use ExecuteJavascriptInWebFrameNotifyResult to return results even in error condition

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_view.cc

Issue 7146024: Use ExecuteJavascriptInWebFrameNotifyResult to return results even in error condition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Don't check against |this| in the destructor, which doesn't compile on Win. Created 9 years, 6 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: content/renderer/render_view.cc

diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc

index 2def6db25e21015eacc0404d9c62a793d4ac0bcf..fc83a1daef2e9c2a2da665225f231880f3672ff5 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);

« no previous file with comments | « chrome/test/data/webui/test_api.js ('k') | no next file » | no next file with comments »