OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_bridge_object.h" | 5 #include "content/renderer/java/gin_java_bridge_object.h" |
6 | 6 |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.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/renderer/v8_value_converter.h" | 9 #include "content/public/renderer/v8_value_converter.h" |
10 #include "content/renderer/java/gin_java_bridge_value_converter.h" | 10 #include "content/renderer/java/gin_java_bridge_value_converter.h" |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 while (args->GetNext(&val)) { | 118 while (args->GetNext(&val)) { |
119 scoped_ptr<base::Value> arg(converter_->FromV8Value(val, context)); | 119 scoped_ptr<base::Value> arg(converter_->FromV8Value(val, context)); |
120 if (arg.get()) { | 120 if (arg.get()) { |
121 arguments.Append(arg.release()); | 121 arguments.Append(arg.release()); |
122 } else { | 122 } else { |
123 arguments.Append(base::Value::CreateNullValue()); | 123 arguments.Append(base::Value::CreateNullValue()); |
124 } | 124 } |
125 } | 125 } |
126 } | 126 } |
127 | 127 |
128 scoped_ptr<base::Value> result = | 128 std::string error_message; |
129 dispatcher_->InvokeJavaMethod(object_id_, name, arguments); | 129 scoped_ptr<base::Value> result = dispatcher_->InvokeJavaMethod( |
| 130 object_id_, name, arguments, &error_message); |
130 if (!result.get()) { | 131 if (!result.get()) { |
131 args->isolate()->ThrowException(v8::Exception::Error(gin::StringToV8( | 132 args->isolate()->ThrowException(v8::Exception::Error(gin::StringToV8( |
132 args->isolate(), kMethodInvocationErrorMessage))); | 133 args->isolate(), error_message))); |
133 return v8::Undefined(args->isolate()); | 134 return v8::Undefined(args->isolate()); |
134 } | 135 } |
135 if (!result->IsType(base::Value::TYPE_BINARY)) { | 136 if (!result->IsType(base::Value::TYPE_BINARY)) { |
136 return converter_->ToV8Value(result.get(), | 137 return converter_->ToV8Value(result.get(), |
137 args->isolate()->GetCurrentContext()); | 138 args->isolate()->GetCurrentContext()); |
138 } | 139 } |
139 | 140 |
140 scoped_ptr<const GinJavaBridgeValue> gin_value = | 141 scoped_ptr<const GinJavaBridgeValue> gin_value = |
141 GinJavaBridgeValue::FromValue(result.get()); | 142 GinJavaBridgeValue::FromValue(result.get()); |
142 if (gin_value->IsType(GinJavaBridgeValue::TYPE_OBJECT_ID)) { | 143 if (gin_value->IsType(GinJavaBridgeValue::TYPE_OBJECT_ID)) { |
(...skipping 13 matching lines...) Expand all Loading... |
156 float float_value; | 157 float float_value; |
157 gin_value->GetAsNonFinite(&float_value); | 158 gin_value->GetAsNonFinite(&float_value); |
158 return v8::Number::New(args->isolate(), float_value); | 159 return v8::Number::New(args->isolate(), float_value); |
159 } | 160 } |
160 return v8::Undefined(args->isolate()); | 161 return v8::Undefined(args->isolate()); |
161 } | 162 } |
162 | 163 |
163 gin::WrapperInfo GinJavaBridgeObject::kWrapperInfo = {gin::kEmbedderNativeGin}; | 164 gin::WrapperInfo GinJavaBridgeObject::kWrapperInfo = {gin::kEmbedderNativeGin}; |
164 | 165 |
165 } // namespace content | 166 } // namespace content |
OLD | NEW |