diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-03-26 13:55:39 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-03-26 18:56:55 +0000 |
| commit | eaaf1391d58f17bde794d6c8634e092209898941 (patch) | |
| tree | ff3702a6509dc9333ffd7515cf078cf69478fcc3 /Source/WebKit2/UIProcess/qt | |
| parent | fdcba363c7e7e01790ba4b946e4f53f8600d8a20 (diff) | |
| download | qtwebkit-eaaf1391d58f17bde794d6c8634e092209898941.tar.gz | |
Import WebKit commit 17e8bfb1ff30314a838b9bf641c112f63a11dba4
Change-Id: Ib6549e44a04300c7b7b07ddc9094b823b37f3183
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit2/UIProcess/qt')
| -rw-r--r-- | Source/WebKit2/UIProcess/qt/QtPageClient.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit2/UIProcess/qt/QtPageClient.h | 2 | ||||
| -rw-r--r-- | Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp index 1b62c94ba..d5afa7996 100644 --- a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp +++ b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp @@ -251,7 +251,7 @@ void QtPageClient::handleWillSetInputMethodState() m_eventHandler->handleWillSetInputMethodState(); } -#if ENABLE(GESTURE_EVENTS) +#if ENABLE(QT_GESTURE_EVENTS) void QtPageClient::doneWithGestureEvent(const WebGestureEvent& event, bool wasEventHandled) { ASSERT(m_eventHandler); diff --git a/Source/WebKit2/UIProcess/qt/QtPageClient.h b/Source/WebKit2/UIProcess/qt/QtPageClient.h index 393629731..a30b25dd3 100644 --- a/Source/WebKit2/UIProcess/qt/QtPageClient.h +++ b/Source/WebKit2/UIProcess/qt/QtPageClient.h @@ -93,7 +93,7 @@ public: void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&) override; void updateTextInputState() override; void handleWillSetInputMethodState() override; -#if ENABLE(GESTURE_EVENTS) +#if ENABLE(QT_GESTURE_EVENTS) void doneWithGestureEvent(const WebGestureEvent&, bool wasEventHandled) override; #endif #if ENABLE(TOUCH_EVENTS) diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp index 9b620fb9d..b56f475cc 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp @@ -261,12 +261,12 @@ void QtWebPageEventHandler::deactivateTapHighlight() void QtWebPageEventHandler::handleSingleTapEvent(const QTouchEvent::TouchPoint& point) { -#if ENABLE(GESTURE_EVENTS) +#if ENABLE(QT_GESTURE_EVENTS) deactivateTapHighlight(); m_postponeTextInputStateChanged = true; QTransform fromItemTransform = m_webPage->transformFromItem(); - WebGestureEvent gesture(WebEvent::GestureSingleTap, fromItemTransform.map(point.pos()).toPoint(), point.screenPos().toPoint(), WebEvent::Modifiers(0), 0, IntSize(point.rect().size().toSize()), FloatPoint(0, 0)); + WebGestureEvent gesture(WebEvent::GestureSingleTap, fromItemTransform.map(point.pos()).toPoint(), point.screenPos().toPoint(), WebEvent::Modifiers(0), 0, IntSize(point.rect().size().toSize())); m_webPageProxy->handleGestureEvent(gesture); #endif } @@ -448,7 +448,7 @@ void QtWebPageEventHandler::handleWillSetInputMethodState() void QtWebPageEventHandler::doneWithGestureEvent(const WebGestureEvent& event, bool wasEventHandled) { -#if ENABLE(GESTURE_EVENTS) +#if ENABLE(QT_GESTURE_EVENTS) if (event.type() != WebEvent::GestureSingleTap) return; |