diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-10-12 15:27:23 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-28 13:32:50 +0100 |
| commit | b104487f072cd04ca4301ba1f10d3ad2e874569e (patch) | |
| tree | 920c6e6fcabdcaff9e4c9f8ead2e6b0c289f99eb /src/core/render_widget_host_view_qt.cpp | |
| parent | 2d002e42a8b6e711e3c9ca5b6dd3611e9d8426ab (diff) | |
Adaptations for 106-based
Change-Id: I2fe91c06ce91dfaace7825a0589b56ee375479b6
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/render_widget_host_view_qt.cpp')
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index dfbbe72e7..0dd067cc5 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -46,12 +46,12 @@ #endif #if defined(USE_AURA) -#include "ui/aura/cursor/cursors_aura.h" +#include "ui/wm/core/cursors_aura.h" #include "ui/base/cursor/cursor_size.h" #endif #if defined(Q_OS_MACOS) -#include "content/app/resources/grit/content_resources.h" +#include "ui/resources/grit/ui_resources.h" #endif #include <QGuiApplication> @@ -419,7 +419,7 @@ bool RenderWidgetHostViewQt::updateCursorFromResource(ui::mojom::CursorType type #if defined(USE_AURA) gfx::Point hotspot; - if (!aura::GetCursorDataFor(ui::CursorSize::kNormal, type, hotspotDpr, &resourceId, &hotspot)) + if (!wm::GetCursorDataFor(ui::CursorSize::kNormal, type, hotspotDpr, &resourceId, &hotspot)) return false; hotX = hotspot.x(); hotY = hotspot.y(); @@ -903,7 +903,9 @@ void RenderWidgetHostViewQt::WheelEventAck(const blink::WebMouseWheelEvent &even } } -void RenderWidgetHostViewQt::GestureEventAck(const blink::WebGestureEvent &event, blink::mojom::InputEventResultState ack_result) +void RenderWidgetHostViewQt::GestureEventAck(const blink::WebGestureEvent &event, + blink::mojom::InputEventResultState ack_result, + blink::mojom::ScrollResultDataPtr scroll_result_data) { // Forward unhandled scroll events back as wheel events if (event.GetType() != blink::WebInputEvent::Type::kGestureScrollUpdate) |