diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-13 15:05:36 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-14 10:33:47 +0000 |
commit | e684a3455bcc29a6e3e66a004e352dea4e1141e7 (patch) | |
tree | d55b4003bde34d7d05f558f02cfd82b2a66a7aac /chromium/content/renderer/java | |
parent | 2b94bfe47ccb6c08047959d1c26e392919550e86 (diff) | |
download | qtwebengine-chromium-e684a3455bcc29a6e3e66a004e352dea4e1141e7.tar.gz |
BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0
Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/content/renderer/java')
-rw-r--r-- | chromium/content/renderer/java/gin_java_bridge_object.cc | 9 | ||||
-rw-r--r-- | chromium/content/renderer/java/gin_java_bridge_value_converter_unittest.cc | 12 |
2 files changed, 13 insertions, 8 deletions
diff --git a/chromium/content/renderer/java/gin_java_bridge_object.cc b/chromium/content/renderer/java/gin_java_bridge_object.cc index a9599aea0d3..89960b995e0 100644 --- a/chromium/content/renderer/java/gin_java_bridge_object.cc +++ b/chromium/content/renderer/java/gin_java_bridge_object.cc @@ -89,10 +89,13 @@ v8::Local<v8::Value> GinJavaBridgeObject::GetNamedProperty( } known_methods_[property] = dispatcher_->HasJavaMethod(object_id_, property); } - if (known_methods_[property]) - return GetFunctionTemplate(isolate, property)->GetFunction(); - else + if (known_methods_[property]) { + return GetFunctionTemplate(isolate, property) + ->GetFunction(isolate->GetCurrentContext()) + .FromMaybe(v8::Local<v8::Value>()); + } else { return v8::Local<v8::Value>(); + } } std::vector<std::string> GinJavaBridgeObject::EnumerateNamedProperties( diff --git a/chromium/content/renderer/java/gin_java_bridge_value_converter_unittest.cc b/chromium/content/renderer/java/gin_java_bridge_value_converter_unittest.cc index 783a2346ab8..9e637b1585c 100644 --- a/chromium/content/renderer/java/gin_java_bridge_value_converter_unittest.cc +++ b/chromium/content/renderer/java/gin_java_bridge_value_converter_unittest.cc @@ -122,11 +122,13 @@ TEST_F(GinJavaBridgeValueConverterTest, TypedArrays) { const char* typed_array_type = array_types[i + 1]; v8::Local<v8::Script> script( v8::Script::Compile( - context, - v8::String::NewFromUtf8( - isolate_, base::StringPrintf(source_template, array_types[i], - typed_array_type) - .c_str())) + context, v8::String::NewFromUtf8( + isolate_, + base::StringPrintf(source_template, array_types[i], + typed_array_type) + .c_str(), + v8::NewStringType::kNormal) + .ToLocalChecked()) .ToLocalChecked()); v8::Local<v8::Value> v8_typed_array = script->Run(context).ToLocalChecked(); std::unique_ptr<base::Value> list_value( |