Changeset 53889 in webkit

Timestamp:

Jan 26, 2010 8:09:22 PM (14 years ago)

Author:

tkent@chromium.org

Message:

2010-01-26 Kent Tamura <​tkent@chromium.org>

Reviewed by Eric Seidel.

[Win] Add modifiers parameter support to Windows DumpRenderTree
​https://bugs.webkit.org/show_bug.cgi?id=34068

Remove listbox-deselect-scroll.html and listbox-selectio-2.html
from Skipped. We improved their portability and Windows DRT now
havs modifiers parameter of eventSender.mouseDown() and
eventSender.mouseUp().

• platform/win/Skipped:

2010-01-26 Kent Tamura <​tkent@chromium.org>

Reviewed by Eric Seidel.

[Win] Add modifiers parameter support to Windows DumpRenderTree
​https://bugs.webkit.org/show_bug.cgi?id=34068

Add support for functional name modifiers; "addSelectionKey" and
"rangeSelectionKey", and modifiers parameter to eventSender.mouseDown()
and eventSender.mouseUp().
This change is similar to r53498 for Mac.

• DumpRenderTree/win/EventSender.cpp: (buildModifierFlags): New function to set MK_CONTROL or MK_SHIFT to WPARAM. (mouseDownCallback): Call buidlModifiersFlags(). (mouseUpCallback): ditto. (keyDownCallback): Add support for "addSelectionkey" and "rangeSelectionKey".

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/win/Skipped (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/win/EventSender.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-26  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        [Win] Add modifiers parameter support to Windows DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=34068
+
+        Remove listbox-deselect-scroll.html and listbox-selectio-2.html
+        from Skipped. We improved their portability and Windows DRT now
+        havs modifiers parameter of eventSender.mouseDown() and
+        eventSender.mouseUp().
+
+        * platform/win/Skipped:
+
 2010-01-26  Adele Peterson  <adele@apple.com>
 

trunk/LayoutTests/platform/win/Skipped

@@ -450 +450 @@
 fast/forms/hidden-listbox.html
 fast/forms/legend-access-key.html
-fast/forms/listbox-deselect-scroll.html
 fast/forms/listbox-hit-test-zoomed.html
 fast/forms/listbox-scrollbar-incremental-load.html
-fast/forms/listbox-selection-2.html
 fast/forms/listbox-width-change.html
 fast/forms/option-strip-whitespace.html

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-26  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        [Win] Add modifiers parameter support to Windows DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=34068
+
+        Add support for functional name modifiers; "addSelectionKey" and
+        "rangeSelectionKey", and modifiers parameter to eventSender.mouseDown()
+        and eventSender.mouseUp().
+        This change is similar to r53498 for Mac.
+        
+        * DumpRenderTree/win/EventSender.cpp:
+        (buildModifierFlags): New function to set MK_CONTROL or MK_SHIFT to WPARAM.
+        (mouseDownCallback): Call buidlModifiersFlags().
+        (mouseUpCallback): ditto.
+        (keyDownCallback): Add support for "addSelectionkey" and "rangeSelectionKey".
+
 2010-01-26  Chris Jerdonek  <cjerdonek@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/win/EventSender.cpp

@@ -145 +145 @@
 }
 
+static WPARAM buildModifierFlags(JSContextRef context, const JSValueRef modifiers)
+{
+    JSObjectRef modifiersArray = JSValueToObject(context, modifiers, 0);
+    if (!modifiersArray)
+        return 0;
+
+    WPARAM flags = 0;
+    int modifiersCount = JSValueToNumber(context, JSObjectGetProperty(context, modifiersArray, JSStringCreateWithUTF8CString("length"), 0), 0);
+    for (int i = 0; i < modifiersCount; ++i) {
+        JSValueRef value = JSObjectGetPropertyAtIndex(context, modifiersArray, i, 0);
+        JSStringRef string = JSValueToStringCopy(context, value, 0);
+        if (JSStringIsEqualToUTF8CString(string, "ctrlKey")
+            || JSStringIsEqualToUTF8CString(string, "addSelectionKey"))
+            flags |= MK_CONTROL;
+        else if (JSStringIsEqualToUTF8CString(string, "shiftKey")
+                 || JSStringIsEqualToUTF8CString(string, "rangeSelectionKey"))
+            flags |= MK_SHIFT;
+        // No way to specifiy altKey in a MSG.
+
+        JSStringRelease(string);
+    }
+    return flags;
+}
+
 static JSValueRef mouseDownCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
@@ -153 +177 @@
     down = true;
     int mouseType = WM_LBUTTONDOWN;
-    if (argumentCount == 1) {
+    if (argumentCount >= 1) {
         int mouseNumber = JSValueToNumber(context, arguments[0], exception);
         switch (mouseNumber) {
@@ -174 +198 @@
         }
     }
+
+    WPARAM wparam = 0;
+    if (argumentCount >= 2)
+        wparam |= buildModifierFlags(context, arguments[1]);
         
-    MSG msg = makeMsg(webViewWindow, mouseType, 0, MAKELPARAM(lastMousePosition.x, lastMousePosition.y));
+    MSG msg = makeMsg(webViewWindow, mouseType, wparam, MAKELPARAM(lastMousePosition.x, lastMousePosition.y));
     if (!msgQueue[endOfQueue].delay)
         dispatchMessage(&msg);
@@ -235 +263 @@
 {
     int mouseType = WM_LBUTTONUP;
-    if (argumentCount == 1) {
+    if (argumentCount >= 1) {
         int mouseNumber = JSValueToNumber(context, arguments[0], exception);
         switch (mouseNumber) {
@@ -257 +285 @@
     }
 
-    MSG msg = makeMsg(webViewWindow, mouseType, 0, MAKELPARAM(lastMousePosition.x, lastMousePosition.y));
+    WPARAM wparam = 0;
+    if (argumentCount >= 2)
+        wparam |= buildModifierFlags(context, arguments[1]);
+
+    MSG msg = makeMsg(webViewWindow, mouseType, wparam, MAKELPARAM(lastMousePosition.x, lastMousePosition.y));
 
     if ((dragMode && !replayingSavedEvents) || msgQueue[endOfQueue].delay) {
@@ -463 +495 @@
                     JSValueRef value = JSObjectGetPropertyAtIndex(context, modifiersArray, i, 0);
                     JSStringRef string = JSValueToStringCopy(context, value, 0);
-                    if (JSStringIsEqualToUTF8CString(string, "ctrlKey"))
+                    if (JSStringIsEqualToUTF8CString(string, "ctrlKey") || JSStringIsEqualToUTF8CString(string, "addSelectionKey"))
                         newKeyState[VK_CONTROL] = 0x80;
-                    else if (JSStringIsEqualToUTF8CString(string, "shiftKey"))
+                    else if (JSStringIsEqualToUTF8CString(string, "shiftKey") || JSStringIsEqualToUTF8CString(string, "rangeSelectionKey"))
                         newKeyState[VK_SHIFT] = 0x80;
                     else if (JSStringIsEqualToUTF8CString(string, "altKey"))