diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-20 14:17:47 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-10 10:26:38 +0200 |
commit | 9cfde2edf4736ae9533e7e1fac495a23ad905419 (patch) | |
tree | 4eca639f54719a8824a527ee6a40fb13b462b110 /src/core/render_widget_host_view_qt.cpp | |
parent | 0a01998411de6a46af8d0b0ae13b8f401cd14a4b (diff) |
Adaptations for Chromium 75
Change-Id: Idad08244e0c749a9f70f5eb9f8cd236039b941b3
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/render_widget_host_view_qt.cpp')
-rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 7fd8cc3d0..a5ae0a04a 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -357,7 +357,7 @@ void RenderWidgetHostViewQt::SetBounds(const gfx::Rect &windowRectInDips) m_delegate->resize(windowRectInDips.width(), windowRectInDips.height()); } -gfx::NativeView RenderWidgetHostViewQt::GetNativeView() const +gfx::NativeView RenderWidgetHostViewQt::GetNativeView() { // gfx::NativeView is a typedef to a platform specific view // pointer (HWND, NSView*, GtkWidget*) and other ports use @@ -394,12 +394,12 @@ void RenderWidgetHostViewQt::Focus() host()->Focus(); } -bool RenderWidgetHostViewQt::HasFocus() const +bool RenderWidgetHostViewQt::HasFocus() { return m_delegate->hasKeyboardFocus(); } -bool RenderWidgetHostViewQt::IsSurfaceAvailableForCopy() const +bool RenderWidgetHostViewQt::IsSurfaceAvailableForCopy() { return true; } @@ -431,7 +431,7 @@ bool RenderWidgetHostViewQt::IsShowing() } // Retrieve the bounds of the View, in screen coordinates. -gfx::Rect RenderWidgetHostViewQt::GetViewBounds() const +gfx::Rect RenderWidgetHostViewQt::GetViewBounds() { return m_viewRectInDips; } @@ -468,8 +468,7 @@ void RenderWidgetHostViewQt::UpdateCursor(const content::WebCursor &webCursor) void RenderWidgetHostViewQt::DisplayCursor(const content::WebCursor &webCursor) { - content::CursorInfo cursorInfo; - webCursor.GetCursorInfo(&cursorInfo); + const content::CursorInfo &cursorInfo = webCursor.info(); Qt::CursorShape shape = Qt::ArrowCursor; #if defined(USE_AURA) ui::CursorType auraType = ui::CursorType::kNull; @@ -694,7 +693,7 @@ void RenderWidgetHostViewQt::SubmitCompositorFrame(const viz::LocalSurfaceId &lo m_adapterClient->updateContentsSize(toQt(m_lastContentsSize)); } -void RenderWidgetHostViewQt::GetScreenInfo(content::ScreenInfo *results) const +void RenderWidgetHostViewQt::GetScreenInfo(content::ScreenInfo *results) { *results = m_screenInfo; } |