WebKit Bugzilla
Attachment 339415 Details for
Bug 185253
: [WPE] Fix build for ENABLE_TOUCH_EVENTS=OFF
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
bug-185253-20180503182534.patch (text/plain), 7.81 KB, created by
Pablo Saavedra
on 2018-05-03 09:25:35 PDT
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Pablo Saavedra
Created:
2018-05-03 09:25:35 PDT
Size:
7.81 KB
patch
obsolete
>Subversion Revision: 231306 >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 6bb98eaeb9de0d45de9fee6354edc6120bd15fb7..d0ed2311bbb287db4e118d19f121927c522c34a3 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,21 @@ >+2018-05-03 Pablo Saavedra <psaavedra@igalia.com> >+ >+ [WPE] Fix build for ENABLE_TOUCH_EVENTS=OFF >+ https://bugs.webkit.org/show_bug.cgi?id=185253 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ This commit is a port of r190987 committed for GTK platform >+ (http://trac.webkit.org/changeset/190987) to WPE >+ >+ * Shared/wpe/NativeWebTouchEventWPE.cpp: >+ * Shared/wpe/WebEventFactory.cpp: >+ * Shared/wpe/WebEventFactory.h: >+ * UIProcess/API/wpe/PageClientImpl.cpp: >+ * UIProcess/API/wpe/PageClientImpl.h: >+ * UIProcess/API/wpe/WPEView.cpp: >+ (WKWPE::m_backend): >+ > 2018-05-03 Ryan Haddad <ryanhaddad@apple.com> > > Unreviewed, rolling out r231253. >diff --git a/Source/WebKit/Shared/wpe/NativeWebTouchEventWPE.cpp b/Source/WebKit/Shared/wpe/NativeWebTouchEventWPE.cpp >index 0cc6658cfb7534e85d015836f5dd4dc0ff7d13d8..ff416807d2c7251bacc9376385563b866da179e4 100644 >--- a/Source/WebKit/Shared/wpe/NativeWebTouchEventWPE.cpp >+++ b/Source/WebKit/Shared/wpe/NativeWebTouchEventWPE.cpp >@@ -26,6 +26,8 @@ > #include "config.h" > #include "NativeWebTouchEvent.h" > >+#if ENABLE(TOUCH_EVENTS) >+ > #include "WebEventFactory.h" > > namespace WebKit { >@@ -44,3 +46,5 @@ NativeWebTouchEvent::NativeWebTouchEvent(struct wpe_input_touch_event* event, fl > } > > } // namespace WebKit >+ >+#endif >diff --git a/Source/WebKit/Shared/wpe/WebEventFactory.cpp b/Source/WebKit/Shared/wpe/WebEventFactory.cpp >index 7ceaf6697b24b069dbcf96bc481b300d4be1fcfe..f6d02804221ff3ca9d54c1998f527102f3d2539c 100644 >--- a/Source/WebKit/Shared/wpe/WebEventFactory.cpp >+++ b/Source/WebKit/Shared/wpe/WebEventFactory.cpp >@@ -168,6 +168,7 @@ WebWheelEvent WebEventFactory::createWebWheelEvent(struct wpe_input_axis_event* > delta, wheelTicks, WebWheelEvent::ScrollByPixelWheelEvent, static_cast<WebEvent::Modifiers>(0), wallTimeForEventTime(event->time)); > } > >+#if ENABLE(TOUCH_EVENTS) > static WebKit::WebPlatformTouchPoint::TouchPointState stateForTouchPoint(int mainEventId, const struct wpe_input_touch_event_raw* point) > { > if (point->id != mainEventId) >@@ -222,5 +223,6 @@ WebTouchEvent WebEventFactory::createWebTouchEvent(struct wpe_input_touch_event* > > return WebTouchEvent(type, WTFMove(touchPoints), WebEvent::Modifiers(0), wallTimeForEventTime(event->time)); > } >+#endif > > } // namespace WebKit >diff --git a/Source/WebKit/Shared/wpe/WebEventFactory.h b/Source/WebKit/Shared/wpe/WebEventFactory.h >index a2aa03450d38f34b11c12ffcb1efb50cac0df791..f4b0550b5be3055eb2102a0400e067722fc83a58 100644 >--- a/Source/WebKit/Shared/wpe/WebEventFactory.h >+++ b/Source/WebKit/Shared/wpe/WebEventFactory.h >@@ -39,7 +39,9 @@ public: > static WebKeyboardEvent createWebKeyboardEvent(struct wpe_input_keyboard_event*); > static WebMouseEvent createWebMouseEvent(struct wpe_input_pointer_event*, float deviceScaleFactor); > static WebWheelEvent createWebWheelEvent(struct wpe_input_axis_event*, float deviceScaleFactor); >+#if ENABLE(TOUCH_EVENTS) > static WebTouchEvent createWebTouchEvent(struct wpe_input_touch_event*, float deviceScaleFactor); >+#endif > }; > > } // namespace WebKit >diff --git a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp >index 59ccb40133b76531346e0a5358172ec3c0f91765..49822c4af36cef4306442ecfa9a9cf18a2b5bf92 100644 >--- a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp >+++ b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp >@@ -176,6 +176,7 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent&, bool) > { > } > >+#if ENABLE(TOUCH_EVENTS) > void PageClientImpl::doneWithTouchEvent(const NativeWebTouchEvent& touchEvent, bool wasEventHandled) > { > if (wasEventHandled) >@@ -220,6 +221,7 @@ void PageClientImpl::doneWithTouchEvent(const NativeWebTouchEvent& touchEvent, b > > page.handleMouseEvent(NativeWebMouseEvent(&pointerEvent, page.deviceScaleFactor())); > } >+#endif > > void PageClientImpl::wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) > { >diff --git a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h >index 167e5656e2804aea29290de34712b16609b4cba7..bfb7684824b3ee95ea21ee78b5b5d438d6ba9f2a 100644 >--- a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h >+++ b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h >@@ -78,7 +78,9 @@ private: > WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) override; > > void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool) override; >+#if ENABLE(TOUCH_EVENTS) > void doneWithTouchEvent(const NativeWebTouchEvent&, bool) override; >+#endif > void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) override; > > RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override; >diff --git a/Source/WebKit/UIProcess/API/wpe/WPEView.cpp b/Source/WebKit/UIProcess/API/wpe/WPEView.cpp >index 48d8044135fd3ccfee1f691de8208466f3ca87a5..f63db53df4c2877d46cd4cc3f102441adc202ac0 100644 >--- a/Source/WebKit/UIProcess/API/wpe/WPEView.cpp >+++ b/Source/WebKit/UIProcess/API/wpe/WPEView.cpp >@@ -31,12 +31,15 @@ > #include "DrawingAreaProxy.h" > #include "NativeWebKeyboardEvent.h" > #include "NativeWebMouseEvent.h" >-#include "NativeWebTouchEvent.h" > #include "NativeWebWheelEvent.h" > #include "WebPageGroup.h" > #include "WebProcessPool.h" > #include <wpe/wpe.h> > >+#if ENABLE(TOUCH_EVENTS) >+#include "NativeWebTouchEvent.h" >+#endif >+ > using namespace WebKit; > > namespace WKWPE { >@@ -123,12 +126,16 @@ View::View(struct wpe_view_backend* backend, const API::PageConfiguration& baseC > auto& page = reinterpret_cast<View*>(data)->page(); > page.handleWheelEvent(WebKit::NativeWebWheelEvent(event, page.deviceScaleFactor())); > }, >+#if ENABLE(TOUCH_EVENTS) > // handle_touch_event > [](void* data, struct wpe_input_touch_event* event) > { > auto& page = reinterpret_cast<View*>(data)->page(); > page.handleTouchEvent(WebKit::NativeWebTouchEvent(event, page.deviceScaleFactor())); > }, >+#else >+ nullptr, >+#endif > // padding > nullptr, > nullptr, >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index cf2bd32f2d63a434397cbef77c6023592ee0b47a..87c048239a06fc50e7e5e90d64205204ab85087a 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,15 @@ >+2018-05-03 Pablo Saavedra <psaavedra@igalia.com> >+ >+ [WPE] Fix build for ENABLE_TOUCH_EVENTS=OFF >+ https://bugs.webkit.org/show_bug.cgi?id=185253 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ This commit is a port of r190987 committed for GTK platform >+ (http://trac.webkit.org/changeset/190987) to WPE >+ >+ * WebKitTestRunner/wpe/EventSenderProxyWPE.cpp: >+ > 2018-05-03 Ryan Haddad <ryanhaddad@apple.com> > > Unreviewed, rolling out r231253. >diff --git a/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp b/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp >index aab11e75515408553b7cebe1cfb3e615d4c43c6e..b3681eeb6612c864c6a85ae861e4d89bafc7ac38 100644 >--- a/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp >+++ b/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp >@@ -280,6 +280,7 @@ void EventSenderProxy::keyDown(WKStringRef keyRef, WKEventModifiers wkModifiers, > wpe_view_backend_dispatch_keyboard_event(m_viewBackend, &event); > } > >+#if ENABLE(TOUCH_EVENTS) > void EventSenderProxy::addTouchPoint(int x, int y) > { > struct wpe_input_touch_event_raw rawEvent { wpe_input_touch_event_type_down, static_cast<uint32_t>(m_time), static_cast<int>(m_touchEvents.size()), static_cast<int32_t>(x), static_cast<int32_t>(y) }; >@@ -376,5 +377,6 @@ void EventSenderProxy::cancelTouchPoint(int) > { > notImplemented(); > } >+#endif > > } // namespace WTR
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
mcatanzaro
:
review-
mcatanzaro
:
commit-queue-
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 185253
:
339408
|
339414
| 339415