Title: [214742] releases/WebKitGTK/webkit-2.16/Source/WebCore
- Revision
- 214742
- Author
- carlo...@webkit.org
- Date
- 2017-04-03 00:21:54 -0700 (Mon, 03 Apr 2017)
Log Message
Merge r213990 - [GTK] Initialize m_button, m_clickCount members in PlatformMouseEvent constructors
https://bugs.webkit.org/show_bug.cgi?id=169666
Reviewed by Michael Catanzaro.
Initialize the m_button and m_clickCount class members in the GTK+-specific
implementation of PlatformMouseEvent constructors to NoButton and 0,
respectively. The constructors expect to operate on passed-in GTK+ events
that will be able to initialize those two members to some valid values, but
this is not guaranteed.
* platform/gtk/PlatformMouseEventGtk.cpp:
(WebCore::PlatformMouseEvent::PlatformMouseEvent):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (214741 => 214742)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-04-03 07:20:54 UTC (rev 214741)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-04-03 07:21:54 UTC (rev 214742)
@@ -1,5 +1,21 @@
2017-03-15 Zan Dobersek <zdober...@igalia.com>
+ [GTK] Initialize m_button, m_clickCount members in PlatformMouseEvent constructors
+ https://bugs.webkit.org/show_bug.cgi?id=169666
+
+ Reviewed by Michael Catanzaro.
+
+ Initialize the m_button and m_clickCount class members in the GTK+-specific
+ implementation of PlatformMouseEvent constructors to NoButton and 0,
+ respectively. The constructors expect to operate on passed-in GTK+ events
+ that will be able to initialize those two members to some valid values, but
+ this is not guaranteed.
+
+ * platform/gtk/PlatformMouseEventGtk.cpp:
+ (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+
+2017-03-15 Zan Dobersek <zdober...@igalia.com>
+
[TexMap] Add missing class member initializations
https://bugs.webkit.org/show_bug.cgi?id=169665
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp (214741 => 214742)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp 2017-04-03 07:20:54 UTC (rev 214741)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/gtk/PlatformMouseEventGtk.cpp 2017-04-03 07:21:54 UTC (rev 214742)
@@ -41,6 +41,8 @@
m_timestamp = event->time;
m_position = IntPoint((int)event->x, (int)event->y);
m_globalPosition = IntPoint((int)event->x_root, (int)event->y_root);
+ m_button = NoButton;
+ m_clickCount = 0;
m_modifierFlags = 0;
if (event->state & GDK_SHIFT_MASK)
@@ -88,6 +90,8 @@
m_timestamp = motion->time;
m_position = IntPoint((int)motion->x, (int)motion->y);
m_globalPosition = IntPoint((int)motion->x_root, (int)motion->y_root);
+ m_button = NoButton;
+ m_clickCount = 0;
m_modifierFlags = 0;
if (motion->state & GDK_SHIFT_MASK)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
