Changeset 53498 in webkit

Timestamp:

Jan 19, 2010 2:50:50 PM (14 years ago)

Author:

eric@webkit.org

Message:

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

Reviewed by Darin Adler.

[DRT][Mac] Add modifiers parameter to eventSender.mouseDown() and eventSender.mouseUp()
​https://bugs.webkit.org/show_bug.cgi?id=33783

Some listbox tests check selection behavior by click events with
"meta" or "shift" keys. Behaviors for such modifier keys are
platform-dependent. The new parameter of mouseDown() and mouseUp()
allows to specify not only concrete modifier keys such as
"shiftKey" "metaKey", but also functional names like
"addSelectionKey" "rangeSelectionKey".

• DumpRenderTree/mac/EventSendingController.mm: (+[EventSendingController isSelectorExcludedFromWebScript:]): (+[EventSendingController webScriptNameForSelector:]): (buildModifierFlags): (-[EventSendingController mouseDown:withModifiers:]): (-[EventSendingController mouseDown:]): (-[EventSendingController mouseUp:withModifiers:]): (-[EventSendingController mouseUp:]): (-[EventSendingController keyDown:withModifiers:withLocation:]):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/mac/EventSendingController.mm (modified) (9 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-19  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        [DRT][Mac] Add modifiers parameter to eventSender.mouseDown() and eventSender.mouseUp()
+        https://bugs.webkit.org/show_bug.cgi?id=33783
+
+        Some listbox tests check selection behavior by click events with
+        "meta" or "shift" keys. Behaviors for such modifier keys are
+        platform-dependent. The new parameter of mouseDown() and mouseUp()
+        allows to specify not only concrete modifier keys such as
+        "shiftKey" "metaKey", but also functional names like
+        "addSelectionKey" "rangeSelectionKey".
+
+        * DumpRenderTree/mac/EventSendingController.mm:
+        (+[EventSendingController isSelectorExcludedFromWebScript:]):
+        (+[EventSendingController webScriptNameForSelector:]):
+        (buildModifierFlags):
+        (-[EventSendingController mouseDown:withModifiers:]):
+        (-[EventSendingController mouseDown:]):
+        (-[EventSendingController mouseUp:withModifiers:]):
+        (-[EventSendingController mouseUp:]):
+        (-[EventSendingController keyDown:withModifiers:withLocation:]):
+
 2010-01-19  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/mac/EventSendingController.mm

@@ -129 +129 @@
             || aSelector == @selector(leapForward:)
             || aSelector == @selector(mouseDown:)
+            || aSelector == @selector(mouseDown:withModifiers:)
             || aSelector == @selector(mouseMoveToX:Y:)
             || aSelector == @selector(mouseUp:)
+            || aSelector == @selector(mouseUp:withModifiers:)
             || aSelector == @selector(scheduleAsynchronousClick)
             || aSelector == @selector(textZoomIn)
@@ -159 +161 @@
     if (aSelector == @selector(leapForward:))
         return @"leapForward";
-    if (aSelector == @selector(mouseDown:))
+    if (aSelector == @selector(mouseDown:) || aSelector == @selector(mouseDown:withModifiers:))
         return @"mouseDown";
-    if (aSelector == @selector(mouseUp:))
+    if (aSelector == @selector(mouseUp:) || aSelector == @selector(mouseUp:withModifiers:))
         return @"mouseUp";
     if (aSelector == @selector(mouseMoveToX:Y:))
@@ -286 +288 @@
 }
 
-- (void)mouseDown:(int)buttonNumber
+static int buildModifierFlags(const WebScriptObject* modifiers)
+{
+    int flags = 0;
+    if (![modifiers isKindOfClass:[WebScriptObject class]])
+        return flags;
+    for (unsigned i = 0; [[modifiers webScriptValueAtIndex:i] isKindOfClass:[NSString class]]; i++) {
+        NSString* modifierName = (NSString*)[modifiers webScriptValueAtIndex:i];
+        if ([modifierName isEqual:@"ctrlKey"])
+            flags |= NSControlKeyMask;
+        else if ([modifierName isEqual:@"shiftKey"] || [modifierName isEqual:@"rangeSelectionKey"])
+            flags |= NSShiftKeyMask;
+        else if ([modifierName isEqual:@"altKey"])
+            flags |= NSAlternateKeyMask;
+        else if ([modifierName isEqual:@"metaKey"] || [modifierName isEqual:@"addSelectionKey"])
+            flags |= NSCommandKeyMask;
+    }
+    return flags;
+}
+
+- (void)mouseDown:(int)buttonNumber withModifiers:(WebScriptObject*)modifiers
 {
     [[[mainFrame frameView] documentView] layout];
@@ -294 +315 @@
     NSEvent *event = [NSEvent mouseEventWithType:eventType
                                         location:lastMousePosition 
-                                   modifierFlags:0 
+                                   modifierFlags:buildModifierFlags(modifiers)
                                        timestamp:[self currentEventTime]
                                     windowNumber:[[[mainFrame webView] window] windowNumber] 
@@ -310 +331 @@
 }
 
+- (void)mouseDown:(int)buttonNumber
+{
+    [self mouseDown:buttonNumber withModifiers:nil];
+}
+
 - (void)textZoomIn
 {
@@ -330 +356 @@
 }
 
-- (void)mouseUp:(int)buttonNumber
+- (void)mouseUp:(int)buttonNumber withModifiers:(WebScriptObject*)modifiers
 {
     if (dragMode && !replayingSavedEvents) {
-        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[EventSendingController instanceMethodSignatureForSelector:@selector(mouseUp:)]];
+        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[EventSendingController instanceMethodSignatureForSelector:@selector(mouseUp:withModifiers:)]];
         [invocation setTarget:self];
-        [invocation setSelector:@selector(mouseUp:)];
+        [invocation setSelector:@selector(mouseUp:withModifiers:)];
         [invocation setArgument:&buttonNumber atIndex:2];
+        [invocation setArgument:&modifiers atIndex:3];
         
         [EventSendingController saveEvent:invocation];
@@ -348 +375 @@
     NSEvent *event = [NSEvent mouseEventWithType:eventType
                                         location:lastMousePosition 
-                                   modifierFlags:0 
+                                   modifierFlags:buildModifierFlags(modifiers)
                                        timestamp:[self currentEventTime]
                                     windowNumber:[[[mainFrame webView] window] windowNumber] 
@@ -384 +411 @@
 }
 
+- (void)mouseUp:(int)buttonNumber
+{
+    [self mouseUp:buttonNumber withModifiers:nil];
+}
+
 - (void)mouseMoveToX:(int)x Y:(int)y
 {
@@ -525 +557 @@
     }
 
-    if ([modifiers isKindOfClass:[WebScriptObject class]]) {
-        for (unsigned i = 0; [[modifiers webScriptValueAtIndex:i] isKindOfClass:[NSString class]]; i++) {
-            NSString *modifier = (NSString *)[modifiers webScriptValueAtIndex:i];
-            if ([modifier isEqual:@"ctrlKey"])
-                modifierFlags |= NSControlKeyMask;
-            else if ([modifier isEqual:@"shiftKey"])
-                modifierFlags |= NSShiftKeyMask;
-            else if ([modifier isEqual:@"altKey"])
-                modifierFlags |= NSAlternateKeyMask;
-            else if ([modifier isEqual:@"metaKey"])
-                modifierFlags |= NSCommandKeyMask;
-        }
-    }
+    modifierFlags |= buildModifierFlags(modifiers);
 
     if (keyLocation == DOM_KEY_LOCATION_NUMPAD)