Changeset 181851 in webkit

Timestamp:

Mar 23, 2015, 3:05:12 AM (11 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK] Use std::abs() in ClickCounter::currentClickCountForGdkButtonEvent()
​https://bugs.webkit.org/show_bug.cgi?id=142964

Reviewed by Carlos Garcia Campos.

• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(ClickCounter::currentClickCountForGdkButtonEvent): Use the STL's std::abs()
instead of C's abs(). The templated nature of std::abs() ensures the proper
computation that matches the types of the passed-in values, and shuts down
a warning when compiling with Clang.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-23  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Use std::abs() in ClickCounter::currentClickCountForGdkButtonEvent()
+        https://bugs.webkit.org/show_bug.cgi?id=142964
+
+        Reviewed by Carlos Garcia Campos.
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (ClickCounter::currentClickCountForGdkButtonEvent): Use the STL's std::abs()
+        instead of C's abs(). The templated nature of std::abs() ensures the proper
+        computation that matches the types of the passed-in values, and shuts down
+        a warning when compiling with Clang.
+
 2015-03-23  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

@@ -116 +116 @@
 
         if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS)
-            || ((abs(buttonEvent->x - previousClickPoint.x()) < doubleClickDistance)
-                && (abs(buttonEvent->y - previousClickPoint.y()) < doubleClickDistance)
+            || ((std::abs(buttonEvent->x - previousClickPoint.x()) < doubleClickDistance)
+                && (std::abs(buttonEvent->y - previousClickPoint.y()) < doubleClickDistance)
                 && (eventTime - previousClickTime < static_cast<unsigned>(doubleClickTime))
                 && (buttonEvent->button == previousClickButton)))