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

Unified Diff: content/child/v8_value_converter_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/browser/gpu/gpu_internals_ui.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/v8_value_converter_impl.cc
diff --git a/content/child/v8_value_converter_impl.cc b/content/child/v8_value_converter_impl.cc
index c2f0b470c5b9f9431bba46a7d0f81c64b1bdeaa6..fd36cf287c5649c08aa5964679cb013464f3dfeb 100644
--- a/content/child/v8_value_converter_impl.cc
+++ b/content/child/v8_value_converter_impl.cc
@@ -293,7 +293,7 @@ base::Value* V8ValueConverterImpl::FromV8ValueImpl(
return NULL;
if (val->IsNull())
- return base::Value::CreateNullValue();
+ return base::Value::CreateNullValue().release();
if (val->IsBoolean())
return new base::FundamentalValue(val->ToBoolean(isolate)->Value());
@@ -371,7 +371,7 @@ base::Value* V8ValueConverterImpl::FromV8Array(
FromV8ValueState* state,
v8::Isolate* isolate) const {
if (!state->UpdateAndCheckUniqueness(val))
- return base::Value::CreateNullValue();
+ return base::Value::CreateNullValue().release();
scoped_ptr<v8::Context::Scope> scope;
// If val was created in a different context than our current one, change to
@@ -456,7 +456,7 @@ base::Value* V8ValueConverterImpl::FromV8Object(
FromV8ValueState* state,
v8::Isolate* isolate) const {
if (!state->UpdateAndCheckUniqueness(val))
- return base::Value::CreateNullValue();
+ return base::Value::CreateNullValue().release();
scoped_ptr<v8::Context::Scope> scope;
// If val was created in a different context than our current one, change to
« no previous file with comments | « content/browser/gpu/gpu_internals_ui.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698