Changeset 230420 in webkit

Timestamp:

Apr 9, 2018 6:00:10 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r230074 - [WPE] Floating point exception in WebEventFactory::createWebWheelEvent
​https://bugs.webkit.org/show_bug.cgi?id=184037

Patch by Carlos Eduardo Ramalho <​cadubentzen@gmail.com> on 2018-03-29
Reviewed by Žan Doberšek.

• Shared/wpe/WebEventFactory.cpp:

(WebKit::WebEventFactory::createWebWheelEvent): Use std::copysign() to avoid division by 0.

Location:

releases/WebKitGTK/webkit-2.20/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/wpe/WebEventFactory.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog

@@ +1 @@
+2018-03-29  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
+
+        [WPE] Floating point exception in WebEventFactory::createWebWheelEvent
+        https://bugs.webkit.org/show_bug.cgi?id=184037
+
+        Reviewed by Žan Doberšek.
+
+        * Shared/wpe/WebEventFactory.cpp:
+        (WebKit::WebEventFactory::createWebWheelEvent): Use std::copysign() to avoid division by 0.
+
 2018-03-25  Michael Catanzaro  <mcatanzaro@igalia.com>
 

releases/WebKitGTK/webkit-2.20/Source/WebKit/Shared/wpe/WebEventFactory.cpp

@@ -28 +28 @@
 
 #include <WebCore/Scrollbar.h>
-#include <cstdlib>
+#include <cmath>
 #include <wpe/input.h>
 #include <wtf/glib/GUniquePtr.h>
@@ -146 +146 @@
     switch (event->axis) {
     case Vertical:
-        wheelTicks = WebCore::FloatSize(0, event->value / std::abs(event->value));
+        wheelTicks = WebCore::FloatSize(0, std::copysign(1, event->value));
         delta = wheelTicks;
         delta.scale(WebCore::Scrollbar::pixelsPerLineStep());
         break;
     case Horizontal:
-        wheelTicks = WebCore::FloatSize(event->value / std::abs(event->value), 0);
+        wheelTicks = WebCore::FloatSize(std::copysign(1, event->value), 0);
         delta = wheelTicks;
         delta.scale(WebCore::Scrollbar::pixelsPerLineStep());