Changeset 252451 in webkit

Timestamp:

Nov 13, 2019 10:58:56 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Fix GTK/WPE builds after enabling POINTER_EVENTS support
​https://bugs.webkit.org/show_bug.cgi?id=204164

Patch by Nikolas Zimmermann <​nzimmermann@igalia.com> on 2019-11-13
Reviewed by Žan Doberšek.

Our g++ 8.3.0 yields "error: call to non-constexpr function
WTFReportAssertionFailure" when compiling rendering/EventRegion.cpp
since r252366.

Turn both toTouchAction() / toIndex() into static inline instead of
constexpr functions to appease g++ 8.3.0.

• rendering/EventRegion.cpp:

(WebCore::toIndex):
(WebCore::toTouchAction):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/EventRegion.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-13  Nikolas Zimmermann  <nzimmermann@igalia.com>
+
+        Fix GTK/WPE builds after enabling POINTER_EVENTS support
+        https://bugs.webkit.org/show_bug.cgi?id=204164
+
+        Reviewed by Žan Doberšek.
+
+        Our g++ 8.3.0 yields "error: call to non-constexpr function
+        WTFReportAssertionFailure" when compiling rendering/EventRegion.cpp
+        since r252366.
+
+        Turn both toTouchAction() / toIndex() into static inline instead of
+        constexpr functions to appease g++ 8.3.0.
+
+        * rendering/EventRegion.cpp:
+        (WebCore::toIndex):
+        (WebCore::toTouchAction):
+
 2019-11-13  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/rendering/EventRegion.cpp

@@ -129 +129 @@
 #if ENABLE(POINTER_EVENTS)
 
-constexpr unsigned toIndex(TouchAction touchAction)
+static inline unsigned toIndex(TouchAction touchAction)
 {
     switch (touchAction) {
@@ -149 +149 @@
 }
 
-constexpr TouchAction toTouchAction(unsigned index)
+static inline TouchAction toTouchAction(unsigned index)
 {
     switch (index) {