[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 28f7fbd349ff585c55ebbc7e969bcbbef1e56453
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 13 04:59:25 2009 +0000

    2009-11-12  Kinuko Yasuda  <kinuko at google.com>
    
            Reviewed by Adam Barth.
    
            Makes the output of fast/events/mouse-click-events.html independent
            of the window size.
            https://bugs.webkit.org/show_bug.cgi?id=31405
    
            * fast/events/mouse-click-events-expected.txt:
            * fast/events/script-tests/mouse-click-events.js:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50926 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 292d068..2868154 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-12  Kinuko Yasuda  <kinuko at google.com>
+
+        Reviewed by Adam Barth.
+
+        Makes the output of fast/events/mouse-click-events.html independent
+        of the window size.
+        https://bugs.webkit.org/show_bug.cgi?id=31405
+
+        * fast/events/mouse-click-events-expected.txt:
+        * fast/events/script-tests/mouse-click-events.js:
+
 2009-11-12  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/LayoutTests/fast/events/mouse-click-events-expected.txt b/LayoutTests/fast/events/mouse-click-events-expected.txt
index ca3033b..a62adae 100644
--- a/LayoutTests/fast/events/mouse-click-events-expected.txt
+++ b/LayoutTests/fast/events/mouse-click-events-expected.txt
@@ -4,34 +4,13 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 Left Mouse Button
-mousedown(0)
-mouseup(0)
-click(0)
-mousedown(0)
-mouseup(0)
-click(0)
-dblclick(0)
+PASS eventLog is "mousedown(0) mouseup(0) click(0) mousedown(0) mouseup(0) click(0) dblclick(0) "
 Middle Mouse Button
-mousedown(1)
-mouseup(1)
-click(1)
-mousedown(1)
-mouseup(1)
-click(1)
-dblclick(1)
+PASS eventLog is "mousedown(1) mouseup(1) click(1) mousedown(1) mouseup(1) click(1) dblclick(1) "
 Right Mouse Button
-mousedown(2)
-mouseup(2)
-mousedown(2)
-mouseup(2)
+PASS eventLog is "mousedown(2) mouseup(2) mousedown(2) mouseup(2) "
 4th Mouse Button
-mousedown(1)
-mouseup(1)
-click(1)
-mousedown(1)
-mouseup(1)
-click(1)
-dblclick(1)
+PASS eventLog is "mousedown(1) mouseup(1) click(1) mousedown(1) mouseup(1) click(1) dblclick(1) "
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/LayoutTests/fast/events/script-tests/mouse-click-events.js b/LayoutTests/fast/events/script-tests/mouse-click-events.js
index 47109a2..72a341b 100644
--- a/LayoutTests/fast/events/script-tests/mouse-click-events.js
+++ b/LayoutTests/fast/events/script-tests/mouse-click-events.js
@@ -5,14 +5,24 @@ div.style.width = "100px";
 div.style.height = "100px";
 div.style.backgroundColor = "blue";
 
-function logEvent() {
-    debug(event.type + "(" + event.button + ")");
+var eventLog = "";
+
+function appendEventLog() {
+    if (window.eventSender) {
+        eventLog += event.type + "(" + event.button + ") ";
+    } else {
+        debug(event.type + "(" + event.button + ")");
+    }
+}
+
+function clearEventLog() {
+    eventLog = "";
 }
 
-div.addEventListener("click", logEvent, false);
-div.addEventListener("dblclick", logEvent, false);
-div.addEventListener("mousedown", logEvent, false);
-div.addEventListener("mouseup", logEvent, false);
+div.addEventListener("click", appendEventLog, false);
+div.addEventListener("dblclick", appendEventLog, false);
+div.addEventListener("mousedown", appendEventLog, false);
+div.addEventListener("mouseup", appendEventLog, false);
 document.body.insertBefore(div, document.body.firstChild);
 
 if (window.eventSender)
@@ -30,16 +40,18 @@ function sendEvents(button) {
     // could test dragging here too
 }
 
-debug("Left Mouse Button");
-sendEvents(0);
-
-debug("Middle Mouse Button");
-sendEvents(1);
-
-debug("Right Mouse Button");
-sendEvents(2);
+function testEvents(description, button, expectedString) {
+    debug(description);
+    sendEvents(button);
+    shouldBeEqualToString("eventLog", expectedString);
+    clearEventLog();
+}
 
-debug("4th Mouse Button");
-sendEvents(3);
+if (window.eventSender) {
+    testEvents("Left Mouse Button", 0, "mousedown(0) mouseup(0) click(0) mousedown(0) mouseup(0) click(0) dblclick(0) ");
+    testEvents("Middle Mouse Button", 1, "mousedown(1) mouseup(1) click(1) mousedown(1) mouseup(1) click(1) dblclick(1) ");
+    testEvents("Right Mouse Button", 2, "mousedown(2) mouseup(2) mousedown(2) mouseup(2) ");
+    testEvents("4th Mouse Button", 3, "mousedown(1) mouseup(1) click(1) mousedown(1) mouseup(1) click(1) dblclick(1) ");
+}
 
 var successfullyParsed = true;

-- 
WebKit Debian packaging