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

[hamaji at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 39bc85ccaa28df54a658f100f06427c52dc51575
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 8 05:48:40 2009 +0000

    2009-12-07  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Reviewed by Darin Adler.
    
            editing/selection/last-empty-inline is failing in Windows
            https://bugs.webkit.org/show_bug.cgi?id=31985
    
            * editing/selection/last-empty-inline-expected.txt:
            * editing/selection/last-empty-inline.html:
            * platform/qt/Skipped:
            * platform/win/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51834 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index cf033c5..f22f971 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-07  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        editing/selection/last-empty-inline is failing in Windows
+        https://bugs.webkit.org/show_bug.cgi?id=31985
+
+        * editing/selection/last-empty-inline-expected.txt:
+        * editing/selection/last-empty-inline.html:
+        * platform/qt/Skipped:
+        * platform/win/Skipped:
+
 2009-12-07  Fumitoshi Ukai  <ukai at chromium.org>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/LayoutTests/editing/selection/last-empty-inline-expected.txt b/LayoutTests/editing/selection/last-empty-inline-expected.txt
index 44464d1..fd2d9e1 100644
--- a/LayoutTests/editing/selection/last-empty-inline-expected.txt
+++ b/LayoutTests/editing/selection/last-empty-inline-expected.txt
@@ -1,2 +1,2 @@
-To test this manually, press mouse button below the comma between "Hello" and "world!" and drag the mouse to the comma. It's OK if "world!" is selected.
+To test this manually, press mouse button below the '!' and drag the mouse to the comma between "Hello" and "world!". It's OK if "world!" is selected.
 PASS
diff --git a/LayoutTests/editing/selection/last-empty-inline.html b/LayoutTests/editing/selection/last-empty-inline.html
index 2332981..0fe8c62 100644
--- a/LayoutTests/editing/selection/last-empty-inline.html
+++ b/LayoutTests/editing/selection/last-empty-inline.html
@@ -1,9 +1,9 @@
 <div>
-To test this manually, press mouse button below the comma between "Hello" and "world!" and drag the mouse to the comma. It's OK if "world!" is selected.
+To test this manually, press mouse button below the '!' and drag the mouse to the comma between "Hello" and "world!". It's OK if "world!" is selected.
 </div>
 
 <div id="result" style="width: 200px;">
-<span>Hello,</span><span id="world">world!</span><span style="padding-left: 200px; padding-bottom: 200px; background-color: blue; height: 200px;"></span>
+<span>Hello,</span><span id="world">world!</span><br><span style="padding-left: 200px; padding-bottom: 200px; background-color: blue; height: 200px;"></span>
 </div>
 
 <script>
@@ -11,13 +11,15 @@ if (window.layoutTestController) {
     layoutTestController.dumpAsText();
 
     var world = document.getElementById("world");
-    var x = world.offsetLeft;
-    var y = world.offsetTop;
+    var endX = world.offsetLeft;
+    var startX = endX + world.offsetWidth;
+    var endY = world.offsetTop;
+    var startY = endY + 50;
 
-    eventSender.mouseMoveTo(x, y + 50);
+    eventSender.mouseMoveTo(startX, startY);
     eventSender.mouseDown();
-    eventSender.mouseMoveTo(x, y + 50);
-    eventSender.mouseMoveTo(x, y);
+    eventSender.mouseMoveTo(startX, startY);
+    eventSender.mouseMoveTo(endX, endY);
     eventSender.mouseUp();
 
     var result = document.getElementById("result");
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 184e5de..ce24460 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -322,6 +322,7 @@ editing/selection/expanding-selections.html
 editing/selection/fake-doubleclick.html
 editing/selection/fake-drag.html
 editing/selection/inline-closest-leaf-child.html
+editing/selection/last-empty-inline.html
 editing/selection/mixed-editability-1.html
 editing/selection/paragraph-granularity.html
 editing/selection/select-from-textfield-outwards.html
@@ -5127,10 +5128,6 @@ fast/css/namespaces/namespaces-comments.xml
 # new test without expected file introduced by http://trac.webkit.org/changeset/51556
 fast/css/namespaces/namespaces-empty.xml
 
-# Failure introduced by http://trac.webkit.org/changeset/51429
-# hamaji will look into this.
-editing/selection/last-empty-inline.html
-
 # Failing tests due to
 # layoutTestController.notifyDone() bug
 # https://bugs.webkit.org/show_bug.cgi?id=31626
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index bfef961..281ccf3 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -705,10 +705,6 @@ plugins/reloadplugins-no-pages.html
 # These tests require Qt Widgets
 plugins/qt-qwidget-plugin.html
 
-# Failure introduced by http://trac.webkit.org/changeset/51429
-# hamaji will look into this.
-editing/selection/last-empty-inline.html
-
 # Some versions of CFNetwork override CGI scripts' Content-Type headers <rdar://problem/7434354>
 http/tests/globalhistory/history-delegate-basic-refresh-redirect.html
 http/tests/loading/redirect-with-no-location-crash.html

-- 
WebKit Debian packaging