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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad merge Created 5 years, 7 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
« no previous file with comments | « content/child/v8_value_converter_impl.cc ('k') | extensions/browser/extension_function.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index e6d0ad28a3e28278359523009c886de4eb2a51c9..6dccb3d1ec404d86796c5bbef752f306ed2a4f1f 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1484,8 +1484,9 @@ void RenderFrameImpl::JavaScriptIsolatedWorldRequest::completed(
converter.SetDateAllowed(true);
converter.SetRegExpAllowed(true);
for (const auto& value : result) {
- base::Value* result_value = converter.FromV8Value(value, context);
- list.Append(result_value ? result_value
+ scoped_ptr<base::Value> result_value(
+ converter.FromV8Value(value, context));
+ list.Append(result_value ? result_value.Pass()
: base::Value::CreateNullValue());
}
} else {
@@ -1511,8 +1512,10 @@ void RenderFrameImpl::HandleJavascriptExecutionResult(
V8ValueConverterImpl converter;
converter.SetDateAllowed(true);
converter.SetRegExpAllowed(true);
- base::Value* result_value = converter.FromV8Value(result, context);
- list.Set(0, result_value ? result_value : base::Value::CreateNullValue());
+ scoped_ptr<base::Value> result_value(
+ converter.FromV8Value(result, context));
+ list.Set(0, result_value ? result_value.Pass()
+ : base::Value::CreateNullValue());
} else {
list.Set(0, base::Value::CreateNullValue());
}
« no previous file with comments | « content/child/v8_value_converter_impl.cc ('k') | extensions/browser/extension_function.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698