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

[ojan at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit f972f85c18a707dcec7c9bf8eea17f1a73f5764f
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 15 20:20:12 2010 +0000

    2010-01-15  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Eric Seidel.
    
            svg/custom/marker-changes.svg is flaky
            https://bugs.webkit.org/show_bug.cgi?id=33728
    
            removing gratuitous setTimeout.
    
            * svg/custom/marker-changes.svg:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53337 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 39f014e..d568d24 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,16 @@
 2010-01-15  Ojan Vafai  <ojan at chromium.org>
 
+        Reviewed by Eric Seidel.
+
+        svg/custom/marker-changes.svg is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=33728
+
+        removing gratuitous setTimeout.
+
+        * svg/custom/marker-changes.svg:
+
+2010-01-15  Ojan Vafai  <ojan at chromium.org>
+
         Reviewed by Adam Barth.
 
         transitions/shorthand-border-transitions.html is still flaky on slower bots
diff --git a/LayoutTests/svg/custom/marker-changes.svg b/LayoutTests/svg/custom/marker-changes.svg
index 71c55c4..72c78cb 100644
--- a/LayoutTests/svg/custom/marker-changes.svg
+++ b/LayoutTests/svg/custom/marker-changes.svg
@@ -11,32 +11,23 @@
     </marker>
 </defs>
 
-<script>
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
-
-window.setTimeout("clickNow()", 0);
 
-function clickNow() {
-    if (window.eventSender) {
-        eventSender.mouseMoveTo(150, 135);
-        eventSender.mouseDown();
-        eventSender.mouseUp();
-    }
-
-    if (window.layoutTestController) {
-        layoutTestController.notifyDone();
-    }
-}
+<g onclick="mouseHandler()">
+    <path fill="none" stroke="black" stroke-width="8" marker-start="url(#markerStart)" marker-mid="url(#markerMiddle)" marker-end="url(#markerEnd)" d="M 130 135 L 180 135 L 180 185"/>
+</g>
 
+<script>
 function mouseHandler(evt)
 {
     var marker = document.getElementById("markerStart");
     marker.setAttribute("markerWidth", "2");
 }
+
+if (window.eventSender) {
+    eventSender.mouseMoveTo(150, 135);
+    eventSender.mouseDown();
+    eventSender.mouseUp();
+}
 </script>
 
-<g onclick="mouseHandler()">
-    <path fill="none" stroke="black" stroke-width="8" marker-start="url(#markerStart)" marker-mid="url(#markerMiddle)" marker-end="url(#markerEnd)" d="M 130 135 L 180 135 L 180 185"/>
-</g>
 </svg>

-- 
WebKit Debian packaging