Changeset 20407 in webkit

Timestamp:

Mar 22, 2007 2:53:39 PM (17 years ago)

Author:

aroben

Message:

LayoutTests:

Reviewed by Geoff.

Replaced all calls to eventSender.mouseClick with paired calls to
mouseDown/mouseUp.

• fast/events/click-count.html:
• fast/events/event-sender-mouse-click-expected.txt: Removed.
• fast/events/event-sender-mouse-click.html: Removed.
• fast/events/frame-click-focus.html:
• fast/events/objc-event-api.html:
• fast/forms/focus-selection-input.html:
• fast/forms/focus-selection-textarea.html:

WebKitTools:

Reviewed by Geoff.

Removed eventSender.mouseClick because it was only useful for AppKit
controls, which we don't use anymore.

• DumpRenderTree/EventSendingController.m: (+[EventSendingController isSelectorExcludedFromWebScript:]): Removed mouseClick.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/click-count.html (modified) (1 diff)
• LayoutTests/fast/events/event-sender-mouse-click-expected.txt (deleted)
• LayoutTests/fast/events/event-sender-mouse-click.html (deleted)
• LayoutTests/fast/events/frame-click-focus.html (modified) (2 diffs)
• LayoutTests/fast/events/objc-event-api.html (modified) (1 diff)
• LayoutTests/fast/forms/focus-selection-input.html (modified) (2 diffs)
• LayoutTests/fast/forms/focus-selection-textarea.html (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/EventSendingController.m (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-03-22  Adam Roben  <aroben@apple.com>
+
+        Reviewed by Geoff.
+
+        Replaced all calls to eventSender.mouseClick with paired calls to
+        mouseDown/mouseUp.
+
+        * fast/events/click-count.html:
+        * fast/events/event-sender-mouse-click-expected.txt: Removed.
+        * fast/events/event-sender-mouse-click.html: Removed.
+        * fast/events/frame-click-focus.html:
+        * fast/events/objc-event-api.html:
+        * fast/forms/focus-selection-input.html:
+        * fast/forms/focus-selection-textarea.html:
+
 2007-03-22  Adam Roben  <aroben@apple.com>
 

trunk/LayoutTests/fast/events/click-count.html

@@ -49 +49 @@
     }
     log("Clicking " + clickCount + " times<br>");
-    for (var click = 0; click < clickCount; click++)
-        eventSender.mouseClick();
+    for (var click = 0; click < clickCount; click++) {
+        eventSender.mouseDown();
+        eventSender.mouseUp();
+    }
     clickCount++;
     setTimeout(testClick, 1000);

trunk/LayoutTests/fast/events/frame-click-focus.html

@@ -20 +20 @@
             if (window.eventSender) {
                 eventSender.mouseMoveTo(1, 300);
-                eventSender.mouseClick();
+                eventSender.mouseDown();
+                eventSender.mouseUp();
 
                 // We need to "wait" a bit before the next click -- otherwise it is ignored
@@ -26 +27 @@
 
                 eventSender.mouseMoveTo(50, 50);
-                eventSender.mouseClick();
+                eventSender.mouseDown();
+                eventSender.mouseUp();
 
                 eventSender.leapForward(2000);
 
                 eventSender.mouseMoveTo(1, 300);
-                eventSender.mouseClick();
+                eventSender.mouseDown();
+                eventSender.mouseUp();
             }
         }

trunk/LayoutTests/fast/events/objc-event-api.html

@@ -18 +18 @@
       
       eventSender.mouseMoveTo(400,150);
-      eventSender.mouseClick();
+      eventSender.mouseDown();
+      eventSender.mouseUp();
       
       eventSender.mouseDown();

trunk/LayoutTests/fast/forms/focus-selection-input.html

@@ -35 +35 @@
     shouldBe("fourth.selectionEnd", "19");
     eventSender.mouseMoveTo(fourth.offsetLeft + 4, fourth.offsetTop + 4);
-    eventSender.mouseClick();
+    eventSender.mouseDown();
+    eventSender.mouseUp();
     shouldBe("fourth.selectionStart", "0");
     shouldBe("fourth.selectionEnd", "0");
@@ -43 +44 @@
     var fifthLabel = document.getElementById("fifthLabel");
     eventSender.mouseMoveTo(fifthLabel.offsetLeft + 4, fifthLabel.offsetTop + 4);
-    eventSender.mouseClick();
+    eventSender.mouseDown();
+    eventSender.mouseUp();
     shouldBe("fifth.selectionStart", "11");
     shouldBe("fifth.selectionEnd", "18");

trunk/LayoutTests/fast/forms/focus-selection-textarea.html

@@ -35 +35 @@
     shouldBe("fourth.selectionEnd", "18");
     eventSender.mouseMoveTo(fourth.offsetLeft + 4, fourth.offsetTop + 4);
-    eventSender.mouseClick();
+    eventSender.mouseDown();
+    eventSender.mouseUp();
     shouldBe("fourth.selectionStart", "0");
     shouldBe("fourth.selectionEnd", "0");
@@ -43 +44 @@
     var fifthLabel = document.getElementById("fifthLabel");
     eventSender.mouseMoveTo(fifthLabel.offsetLeft + 4, fifthLabel.offsetTop + 4);
-    eventSender.mouseClick();
+    eventSender.mouseDown();
+    eventSender.mouseUp();
     shouldBe("fifth.selectionStart", "11");
     shouldBe("fifth.selectionEnd", "18");

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2007-03-22  Adam Roben  <aroben@apple.com>
+
+        Reviewed by Geoff.
+
+        Removed eventSender.mouseClick because it was only useful for AppKit
+        controls, which we don't use anymore.
+
+        * DumpRenderTree/EventSendingController.m:
+        (+[EventSendingController isSelectorExcludedFromWebScript:]): Removed
+        mouseClick.
+
 2007-03-22  Adam Roben  <aroben@apple.com>
 

trunk/WebKitTools/DumpRenderTree/EventSendingController.m

@@ -102 +102 @@
     if (aSelector == @selector(mouseDown)
             || aSelector == @selector(mouseUp)
-            || aSelector == @selector(mouseClick)
             || aSelector == @selector(contextClick)
             || aSelector == @selector(mouseMoveToX:Y:)
@@ -287 +286 @@
         } else
             [subView mouseMoved:event];
-    }
-}
-
-- (void)mouseClick
-{
-    [[[frame frameView] documentView] layout];
-    if ([self currentEventTime] - lastClick >= 1)
-        clickCount = 1;
-    else
-        clickCount++;
-    NSEvent *mouseDownEvent = [NSEvent mouseEventWithType:NSLeftMouseDown 
-                                        location:lastMousePosition 
-                                   modifierFlags:0 
-                                       timestamp:[self currentEventTime]
-                                    windowNumber:[[[frame webView] window] windowNumber] 
-                                         context:[NSGraphicsContext currentContext] 
-                                     eventNumber:++eventNumber 
-                                      clickCount:clickCount 
-                                        pressure:0.0];
-
-    NSView *subView = [[frame webView] hitTest:[mouseDownEvent locationInWindow]];
-    if (subView) {
-        [self leapForward:1];
-        NSEvent *mouseUpEvent = [NSEvent mouseEventWithType:NSLeftMouseUp
-                                                   location:lastMousePosition
-                                              modifierFlags:0
-                                                  timestamp:[self currentEventTime]
-                                               windowNumber:[[[frame webView] window] windowNumber]
-                                                    context:[NSGraphicsContext currentContext]
-                                                eventNumber:++eventNumber
-                                                 clickCount:clickCount
-                                                   pressure:0.0];
-        [subView mouseDown:mouseDownEvent];
-        [subView mouseUp:mouseUpEvent];
-        lastClick = [mouseUpEvent timestamp];
     }
 }