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

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: use the actual objects, not empty objects 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 6330cb2358999b5a0984759804b04936ce17ba73..cbf46d92c951bc1bbb0cb09a7c7c814210dd6ebe 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -4229,7 +4229,6 @@ WebKit::WebPlugin* RenderViewImpl::CreatePlugin(
pepper_module.get(), params, pepper_delegate_.AsWeakPtr());
}
-
#if defined(USE_AURA) && !defined(OS_WIN)
return NULL;
#else
@@ -4254,8 +4253,10 @@ void RenderViewImpl::EvaluateScript(const string16& frame_xpath,
v8::Context::Scope context_scope(context);
V8ValueConverterImpl converter;
converter.SetDateAllowed(true);
- converter.SetRegexpAllowed(true);
- list.Set(0, converter.FromV8Value(result, context));
+ converter.SetRegExpAllowed(true);
+ 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