Title: [181950] releases/WebKitGTK/webkit-2.8/Source/WebKit2
- Revision
- 181950
- Author
- [email protected]
- Date
- 2015-03-25 04:27:16 -0700 (Wed, 25 Mar 2015)
Log Message
Merge r181851 - [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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (181949 => 181950)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-03-25 11:25:31 UTC (rev 181949)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-03-25 11:27:16 UTC (rev 181950)
@@ -1,5 +1,18 @@
2015-03-23 Zan Dobersek <[email protected]>
+ [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 <[email protected]>
+
[GTK][WK2] webkitBackForwardListChanged() should operate on a Vector reference
https://bugs.webkit.org/show_bug.cgi?id=142963
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (181949 => 181950)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-03-25 11:25:31 UTC (rev 181949)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-03-25 11:27:16 UTC (rev 181950)
@@ -115,8 +115,8 @@
}
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)))
currentClickCount++;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
