diff options
| author | estade <estade@chromium.org> | 2015-05-12 11:11:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-12 18:12:00 +0000 |
| commit | a68b0442058dc2c5e61177b88697d8a461667328 (patch) | |
| tree | c78360424be712d325ff8f8ea428c2703d655899 /content/renderer | |
| parent | 90e34895f20edf97693c14ac0ec6faf64dbdcd91 (diff) | |
| download | chromium_src-a68b0442058dc2c5e61177b88697d8a461667328.zip chromium_src-a68b0442058dc2c5e61177b88697d8a461667328.tar.gz chromium_src-a68b0442058dc2c5e61177b88697d8a461667328.tar.bz2 | |
More base::Values-related bare pointer -> scoped_ptr conversions
main change: Value::CreateNullValue returns a scoped_ptr
BUG=none
Review URL: https://codereview.chromium.org/1129083003
Cr-Commit-Position: refs/heads/master@{#329443}
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/render_frame_impl.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index e6d0ad2..6dccb3d 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()); } |