Title: [252451] trunk/Source/WebCore
Revision
252451
Author
[email protected]
Date
2019-11-13 22:58:56 -0800 (Wed, 13 Nov 2019)

Log Message

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

Patch by Nikolas Zimmermann <[email protected]> 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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (252450 => 252451)


--- trunk/Source/WebCore/ChangeLog	2019-11-14 06:39:08 UTC (rev 252450)
+++ trunk/Source/WebCore/ChangeLog	2019-11-14 06:58:56 UTC (rev 252451)
@@ -1,3 +1,21 @@
+2019-11-13  Nikolas Zimmermann  <[email protected]>
+
+        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  <[email protected]>
 
         [Clipboard API] Add support for Clipboard.write()

Modified: trunk/Source/WebCore/rendering/EventRegion.cpp (252450 => 252451)


--- trunk/Source/WebCore/rendering/EventRegion.cpp	2019-11-14 06:39:08 UTC (rev 252450)
+++ trunk/Source/WebCore/rendering/EventRegion.cpp	2019-11-14 06:58:56 UTC (rev 252451)
@@ -128,7 +128,7 @@
 
 #if ENABLE(POINTER_EVENTS)
 
-constexpr unsigned toIndex(TouchAction touchAction)
+static inline unsigned toIndex(TouchAction touchAction)
 {
     switch (touchAction) {
     case TouchAction::None:
@@ -148,7 +148,7 @@
     return 0;
 }
 
-constexpr TouchAction toTouchAction(unsigned index)
+static inline TouchAction toTouchAction(unsigned index)
 {
     switch (index) {
     case 0:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to