| 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());
|
| }
|
|
|