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

Unified Diff: content/renderer/render_view_impl.cc

Issue 10890002: Make V8ValueConverter.FromV8Value behave similarly to JSON.stringify (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ignore -> omit Created 8 years, 3 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_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index d2d7de38ccf50dff6bf95412943386515cebe84b..002c858e52a9080568acf9b8b92cb6ec591bb81d 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -4254,7 +4254,9 @@ void RenderViewImpl::EvaluateScript(const string16& frame_xpath,
V8ValueConverterImpl converter;
converter.SetDateAllowed(true);
converter.SetRegexpAllowed(true);
- list.Set(0, converter.FromV8Value(result, context));
+ base::Value* result_value = converter.FromV8Value(result, context);
+ list.Set(0, result_value ? result_value :
+ base::Value::CreateNullValue());
} else {
list.Set(0, Value::CreateNullValue());
}

Powered by Google App Engine
This is Rietveld 408576698