OLD | NEW |
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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 } | 71 } |
72 | 72 |
73 GinJavaBridgeError error; | 73 GinJavaBridgeError error; |
74 std::unique_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 std::unique_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 |
OLD | NEW |