Title: [91173] trunk/Source/WebKit2
- Revision
- 91173
- Author
- [email protected]
- Date
- 2011-07-17 23:30:31 -0700 (Sun, 17 Jul 2011)
Log Message
[GTK] Fix selection of elements in a multi select list and remove an unnecessary include in WorkQueue
https://bugs.webkit.org/show_bug.cgi?id=64666
Patch by Amruth Raj <[email protected]> on 2011-07-17
Reviewed by Martin Robinson.
* Platform/gtk/WorkQueueGtk.cpp: Remove an include which is no longer required
* Shared/gtk/WebEventFactory.cpp:
(WebKit::modifiersForEvent): Fix an incorrect ASSERT statement
(WebKit::WebEventFactory::createWebMouseEvent): Call the function to determine the modifier keys
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (91172 => 91173)
--- trunk/Source/WebKit2/ChangeLog 2011-07-18 06:24:03 UTC (rev 91172)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-18 06:30:31 UTC (rev 91173)
@@ -1,3 +1,15 @@
+2011-07-17 Amruth Raj <[email protected]>
+
+ [GTK] Fix selection of elements in a multi select list and remove an unnecessary include in WorkQueue
+ https://bugs.webkit.org/show_bug.cgi?id=64666
+
+ Reviewed by Martin Robinson.
+
+ * Platform/gtk/WorkQueueGtk.cpp: Remove an include which is no longer required
+ * Shared/gtk/WebEventFactory.cpp:
+ (WebKit::modifiersForEvent): Fix an incorrect ASSERT statement
+ (WebKit::WebEventFactory::createWebMouseEvent): Call the function to determine the modifier keys
+
2011-07-17 Lukasz Slachciak <[email protected]>
Reviewed by Martin Robinson.
Modified: trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp (91172 => 91173)
--- trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp 2011-07-18 06:24:03 UTC (rev 91172)
+++ trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp 2011-07-18 06:30:31 UTC (rev 91173)
@@ -29,7 +29,6 @@
#include "WorkQueue.h"
#include "WKBase.h"
-#include <WebCore/NotImplemented.h>
#include <gio/gio.h>
#include <glib.h>
#include <wtf/gobject/GRefPtr.h>
Modified: trunk/Source/WebKit2/Shared/gtk/WebEventFactory.cpp (91172 => 91173)
--- trunk/Source/WebKit2/Shared/gtk/WebEventFactory.cpp 2011-07-18 06:24:03 UTC (rev 91172)
+++ trunk/Source/WebKit2/Shared/gtk/WebEventFactory.cpp 2011-07-18 06:30:31 UTC (rev 91173)
@@ -50,7 +50,9 @@
unsigned modifiers = 0;
GdkModifierType state;
- ASSERT(gdk_event_get_state(event, &state));
+ // Check for a valid state in GdkEvent.
+ if (!gdk_event_get_state(event, &state))
+ return static_cast<WebEvent::Modifiers>(0);
if (state & GDK_CONTROL_MASK)
modifiers |= WebEvent::ControlKey;
@@ -127,7 +129,7 @@
0 /* deltaY */,
0 /* deltaZ */,
currentClickCount,
- static_cast<WebEvent::Modifiers>(0),
+ modifiersForEvent(event),
gdk_event_get_time(event));
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
