Changeset 252402 in webkit

Timestamp:

Nov 13, 2019, 4:31:54 AM (7 years ago)

Author:

Nikolas Zimmermann

Message:

Unreviewed, fix GTK/WPE builds after enabling POINTER_EVENTS support.

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

Simply remove the ASSERT_NOT_REACHED() from toIndex(): a missing value
in the switch statement will be caught by compiler warnings. Remove the
constexpr flag from toTouchAction(): in this case, the
ASSERT_NOT_REACHED() is useful and should stay.

Rubber-stamped by Philippe Normand.

• rendering/EventRegion.cpp:

(WebCore::toIndex): Remove call to ASSERT_NOT_REACHED().
(WebCore::toTouchAction): Keep ASSERT_NOT_REACHED(), removed constexpr.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-13  Nikolas Zimmermann  <nzimmermann@igalia.com>
+
+        Unreviewed, fix GTK/WPE builds after enabling POINTER_EVENTS support.
+
+        Our g++ 8.3.0 yields "error: call to non-constexpr function
+        WTFReportAssertionFailure" when compiling rendering/EventRegion.cpp
+        since r252366.
+
+        Simply remove the ASSERT_NOT_REACHED() from toIndex(): a missing value
+        in the switch statement will be caught by compiler warnings. Remove the
+        constexpr flag from toTouchAction(): in this case, the
+        ASSERT_NOT_REACHED() is useful and should stay.
+
+        Rubber-stamped by Philippe Normand.
+
+        * rendering/EventRegion.cpp:
+        (WebCore::toIndex): Remove call to ASSERT_NOT_REACHED().
+        (WebCore::toTouchAction): Keep ASSERT_NOT_REACHED(), removed constexpr.
+
 2019-11-13  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/rendering/EventRegion.cpp

@@ -145 +145 @@
         break;
     }
-    ASSERT_NOT_REACHED();
     return 0;
 }
 
-constexpr TouchAction toTouchAction(unsigned index)
+TouchAction toTouchAction(unsigned index)
 {
     switch (index) {