1 files changed, 14 insertions, 8 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 4407e706e..0242506ee 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -56,6 +56,7 @@
 #include "content/browser/compositor/surface_utils.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
+#include "content/browser/renderer_host/input/synthetic_gesture_target.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/common/content_switches_internal.h"
@@ -359,7 +360,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
@@ -396,12 +397,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;
 }
@@ -433,7 +434,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;
 }
@@ -470,8 +471,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;
@@ -637,7 +637,8 @@ void RenderWidgetHostViewQt::ImeCompositionRangeChanged(const gfx::Range&, const
 void RenderWidgetHostViewQt::RenderProcessGone(base::TerminationStatus terminationStatus,
                                                int exitCode)
 {
-    if (m_adapterClient) {
+    // RenderProcessHost::FastShutdownIfPossible results in TERMINATION_STATUS_STILL_RUNNING
+    if (m_adapterClient && terminationStatus != base::TERMINATION_STATUS_STILL_RUNNING) {
         m_adapterClient->renderProcessTerminated(
                     m_adapterClient->renderProcessExitStatus(terminationStatus),
                     exitCode);
@@ -695,7 +696,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;
 }
@@ -1740,4 +1741,9 @@ void RenderWidgetHostViewQt::synchronizeVisualProperties(const base::Optional<vi
     host()->SynchronizeVisualProperties();
 }
 
+std::unique_ptr<content::SyntheticGestureTarget> RenderWidgetHostViewQt::CreateSyntheticGestureTarget()
+{
+    return nullptr;
+}
+
 } // namespace QtWebEngineCore