diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/content/renderer/java | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
| download | qtwebengine-chromium-e6430e577f105ad8813c92e75c54660c4985026e.tar.gz | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/content/renderer/java')
3 files changed, 5 insertions, 5 deletions
diff --git a/chromium/content/renderer/java/gin_java_bridge_object.cc b/chromium/content/renderer/java/gin_java_bridge_object.cc index 95f36382a03..d747e3c0d3a 100644 --- a/chromium/content/renderer/java/gin_java_bridge_object.cc +++ b/chromium/content/renderer/java/gin_java_bridge_object.cc @@ -8,14 +8,14 @@ #include "content/public/renderer/render_thread.h" #include "content/renderer/java/gin_java_function_invocation_helper.h" #include "gin/function_template.h" -#include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebLocalFrame.h" namespace content { // static GinJavaBridgeObject* GinJavaBridgeObject::InjectNamed( - blink::WebFrame* frame, + blink::WebLocalFrame* frame, const base::WeakPtr<GinJavaBridgeDispatcher>& dispatcher, const std::string& object_name, GinJavaBridgeDispatcher::ObjectID object_id) { diff --git a/chromium/content/renderer/java/gin_java_bridge_object.h b/chromium/content/renderer/java/gin_java_bridge_object.h index 25d1840b801..23c7efa1186 100644 --- a/chromium/content/renderer/java/gin_java_bridge_object.h +++ b/chromium/content/renderer/java/gin_java_bridge_object.h @@ -17,7 +17,7 @@ #include "v8/include/v8-util.h" namespace blink { -class WebFrame; +class WebLocalFrame; } namespace content { @@ -40,7 +40,7 @@ class GinJavaBridgeObject : public gin::Wrappable<GinJavaBridgeObject>, v8::Isolate* isolate) override; static GinJavaBridgeObject* InjectNamed( - blink::WebFrame* frame, + blink::WebLocalFrame* frame, const base::WeakPtr<GinJavaBridgeDispatcher>& dispatcher, const std::string& object_name, GinJavaBridgeDispatcher::ObjectID object_id); diff --git a/chromium/content/renderer/java/gin_java_bridge_value_converter.cc b/chromium/content/renderer/java/gin_java_bridge_value_converter.cc index c22cbf3c696..8a6230db97c 100644 --- a/chromium/content/renderer/java/gin_java_bridge_value_converter.cc +++ b/chromium/content/renderer/java/gin_java_bridge_value_converter.cc @@ -19,7 +19,7 @@ namespace content { GinJavaBridgeValueConverter::GinJavaBridgeValueConverter() - : converter_(V8ValueConverter::create()) { + : converter_(V8ValueConverter::Create()) { converter_->SetDateAllowed(false); converter_->SetRegExpAllowed(false); converter_->SetFunctionAllowed(true); |