Merge remote-tracking branch 'origin/5.15' into dev

Including update to 87-based

Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6

1 files changed, 8 insertions, 9 deletions

diff --git a/src/core/web_contents_view_qt.h b/src/core/web_contents_view_qt.h
index acf4a1eba..07a78016d 100644
--- a/src/core/web_contents_view_qt.h
+++ b/src/core/web_contents_view_qt.h
@@ -62,6 +62,7 @@ public:
     static inline WebContentsViewQt *from(WebContentsView *view) { return static_cast<WebContentsViewQt*>(view); }
 
     WebContentsViewQt(content::WebContents* webContents);
+
     void setFactoryClient(WebContentsAdapterClient* client);
     void setClient(WebContentsAdapterClient* client);
     WebContentsAdapterClient *client() { return m_client; }
@@ -87,9 +88,7 @@ public:
 
     gfx::NativeWindow GetTopLevelNativeWindow() const override { return nullptr; }
 
-    void GetContainerBounds(gfx::Rect* out) const override;
-
-    void SizeContents(const gfx::Size& size) override { }
+    gfx::Rect GetContainerBounds() const override;
 
     void Focus() override;
 
@@ -105,17 +104,17 @@ public:
 
     void FocusThroughTabTraversal(bool reverse) override;
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
     bool CloseTabAfterEventTrackingIfNeeded() override { QT_NOT_YET_IMPLEMENTED return false; }
-#endif // defined(OS_MACOSX)
+#endif // defined(OS_MAC)
 
     // content::RenderViewHostDelegateView overrides:
-    void StartDragging(const content::DropData& drop_data, blink::WebDragOperationsMask allowed_ops,
+    void StartDragging(const content::DropData& drop_data, blink::DragOperationsMask allowed_ops,
                        const gfx::ImageSkia& image, const gfx::Vector2d& image_offset,
-                       const content::DragEventSourceInfo& event_info,
-                       content::RenderWidgetHostImpl* source_rwh) override;
+                       const blink::mojom::DragEventSourceInfo &event_info,
+                       content::RenderWidgetHostImpl *source_rwh) override;
 
-    void UpdateDragCursor(blink::WebDragOperation dragOperation) override;
+    void UpdateDragCursor(blink::DragOperation dragOperation) override;
 
     void ShowContextMenu(content::RenderFrameHost *, const content::ContextMenuParams &params) override;