Changeset 91173 in webkit

Timestamp:

Jul 17, 2011 11:30:31 PM (13 years ago)

Author:

commit-queue@webkit.org

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 <​amruthraj@motorola.com> 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

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/gtk/WorkQueueGtk.cpp (modified) (1 diff)
• Shared/gtk/WebEventFactory.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-07-17  Amruth Raj  <amruthraj@motorola.com>
+
+        [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  <l.slachciak@samsung.com>
 

trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp

@@ -30 +30 @@
 
 #include "WKBase.h"
-#include <WebCore/NotImplemented.h>
 #include <gio/gio.h>
 #include <glib.h>

trunk/Source/WebKit2/Shared/gtk/WebEventFactory.cpp

@@ -51 +51 @@
     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)
@@ -128 +130 @@
                          0 /* deltaZ */,
                          currentClickCount,
-                         static_cast<WebEvent::Modifiers>(0),
+                         modifiersForEvent(event),
                          gdk_event_get_time(event));
 }