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

Side by Side Diff: content/renderer/java/gin_java_function_invocation_helper.cc

Issue 1873783003: Convert //content/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/java/gin_java_function_invocation_helper.h" 5 #include "content/renderer/java/gin_java_function_invocation_helper.h"
6 6
7 #include "content/common/android/gin_java_bridge_errors.h" 7 #include "content/common/android/gin_java_bridge_errors.h"
8 #include "content/common/android/gin_java_bridge_value.h" 8 #include "content/common/android/gin_java_bridge_value.h"
9 #include "content/public/child/v8_value_converter.h" 9 #include "content/public/child/v8_value_converter.h"
10 #include "content/renderer/java/gin_java_bridge_object.h" 10 #include "content/renderer/java/gin_java_bridge_object.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 args->isolate(), kMethodInvocationOnNonInjectedObjectDisallowed))); 54 args->isolate(), kMethodInvocationOnNonInjectedObjectDisallowed)));
55 return v8::Undefined(args->isolate()); 55 return v8::Undefined(args->isolate());
56 } 56 }
57 57
58 base::ListValue arguments; 58 base::ListValue arguments;
59 { 59 {
60 v8::HandleScope handle_scope(args->isolate()); 60 v8::HandleScope handle_scope(args->isolate());
61 v8::Local<v8::Context> context = args->isolate()->GetCurrentContext(); 61 v8::Local<v8::Context> context = args->isolate()->GetCurrentContext();
62 v8::Local<v8::Value> val; 62 v8::Local<v8::Value> val;
63 while (args->GetNext(&val)) { 63 while (args->GetNext(&val)) {
64 scoped_ptr<base::Value> arg(converter_->FromV8Value(val, context)); 64 std::unique_ptr<base::Value> arg(converter_->FromV8Value(val, context));
65 if (arg.get()) { 65 if (arg.get()) {
66 arguments.Append(arg.release()); 66 arguments.Append(arg.release());
67 } else { 67 } else {
68 arguments.Append(base::Value::CreateNullValue()); 68 arguments.Append(base::Value::CreateNullValue());
69 } 69 }
70 } 70 }
71 } 71 }
72 72
73 GinJavaBridgeError error; 73 GinJavaBridgeError error;
74 scoped_ptr<base::Value> result = dispatcher_->InvokeJavaMethod( 74 std::unique_ptr<base::Value> result = dispatcher_->InvokeJavaMethod(
75 object->object_id(), method_name_, arguments, &error); 75 object->object_id(), method_name_, arguments, &error);
76 if (!result.get()) { 76 if (!result.get()) {
77 args->isolate()->ThrowException(v8::Exception::Error(gin::StringToV8( 77 args->isolate()->ThrowException(v8::Exception::Error(gin::StringToV8(
78 args->isolate(), GinJavaBridgeErrorToString(error)))); 78 args->isolate(), GinJavaBridgeErrorToString(error))));
79 return v8::Undefined(args->isolate()); 79 return v8::Undefined(args->isolate());
80 } 80 }
81 if (!result->IsType(base::Value::TYPE_BINARY)) { 81 if (!result->IsType(base::Value::TYPE_BINARY)) {
82 return converter_->ToV8Value(result.get(), 82 return converter_->ToV8Value(result.get(),
83 args->isolate()->GetCurrentContext()); 83 args->isolate()->GetCurrentContext());
84 } 84 }
85 85
86 scoped_ptr<const GinJavaBridgeValue> gin_value = 86 std::unique_ptr<const GinJavaBridgeValue> gin_value =
87 GinJavaBridgeValue::FromValue(result.get()); 87 GinJavaBridgeValue::FromValue(result.get());
88 if (gin_value->IsType(GinJavaBridgeValue::TYPE_OBJECT_ID)) { 88 if (gin_value->IsType(GinJavaBridgeValue::TYPE_OBJECT_ID)) {
89 GinJavaBridgeObject* result = NULL; 89 GinJavaBridgeObject* result = NULL;
90 GinJavaBridgeDispatcher::ObjectID object_id; 90 GinJavaBridgeDispatcher::ObjectID object_id;
91 if (gin_value->GetAsObjectID(&object_id)) { 91 if (gin_value->GetAsObjectID(&object_id)) {
92 result = dispatcher_->GetObject(object_id); 92 result = dispatcher_->GetObject(object_id);
93 } 93 }
94 if (result) { 94 if (result) {
95 gin::Handle<GinJavaBridgeObject> controller = 95 gin::Handle<GinJavaBridgeObject> controller =
96 gin::CreateHandle(args->isolate(), result); 96 gin::CreateHandle(args->isolate(), result);
97 if (controller.IsEmpty()) 97 if (controller.IsEmpty())
98 return v8::Undefined(args->isolate()); 98 return v8::Undefined(args->isolate());
99 return controller.ToV8(); 99 return controller.ToV8();
100 } 100 }
101 } else if (gin_value->IsType(GinJavaBridgeValue::TYPE_NONFINITE)) { 101 } else if (gin_value->IsType(GinJavaBridgeValue::TYPE_NONFINITE)) {
102 float float_value; 102 float float_value;
103 gin_value->GetAsNonFinite(&float_value); 103 gin_value->GetAsNonFinite(&float_value);
104 return v8::Number::New(args->isolate(), float_value); 104 return v8::Number::New(args->isolate(), float_value);
105 } 105 }
106 return v8::Undefined(args->isolate()); 106 return v8::Undefined(args->isolate());
107 } 107 }
108 108
109 } // namespace content 109 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/java/gin_java_function_invocation_helper.h ('k') | content/renderer/manifest/manifest_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698