[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[mitz at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit dd429f6a93b210073ae974e85df0d6bd3f64aef9
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 18 00:28:18 2010 +0000

    [GTK][Qt] Fails glyph reordering test fast/text/glyph-reordering.html
    https://bugs.webkit.org/show_bug.cgi?id=34918
    
    Reviewed by Eric Seidel.
    
    Made the test less dependent on the complex text implementation.
    
    * fast/text/glyph-reordering-expected.txt:
    * fast/text/glyph-reordering.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54912 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9734438..7d2ec0b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-17  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Eric Seidel.
+
+        [GTK][Qt] Fails glyph reordering test fast/text/glyph-reordering.html
+        https://bugs.webkit.org/show_bug.cgi?id=34918
+
+        Made the test less dependent on the complex text implementation.
+
+        * fast/text/glyph-reordering-expected.txt:
+        * fast/text/glyph-reordering.html:
+
 2010-02-17  Dumitru Daniliuc  <dumi at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/LayoutTests/fast/text/glyph-reordering-expected.txt b/LayoutTests/fast/text/glyph-reordering-expected.txt
index a05a78c..31e634c 100644
--- a/LayoutTests/fast/text/glyph-reordering-expected.txt
+++ b/LayoutTests/fast/text/glyph-reordering-expected.txt
@@ -1,5 +1,5 @@
 This tests text selection in complex scripts where glyph reordering occurs.
 
-हिन्दी
-ि‌हन्दी
+[हिन्दी]
+[न्दी]
 PASS
diff --git a/LayoutTests/fast/text/glyph-reordering.html b/LayoutTests/fast/text/glyph-reordering.html
index 5001bd5..e210719 100644
--- a/LayoutTests/fast/text/glyph-reordering.html
+++ b/LayoutTests/fast/text/glyph-reordering.html
@@ -1,8 +1,8 @@
 <p>
     This tests text selection in complex scripts where glyph reordering occurs.
 </p>
-<div id="target" style="font-size: 48px;">&#x0939;&#x093F;&#x0928;&#x094D;&#x0926;&#x0940;</div>
-<div id="reference" style="font-size: 48px;">&#x093F;&#x200C;&#x0939;&#x0928;&#x094D;&#x0926;&#x0940;</div>
+<div id="target" style="font-size: 48px;"><span>[</span>&#x0939;&#x093F;&#x0928;&#x094D;&#x0926;&#x0940;<span>]</span></div>
+<div id="reference" style="font-size: 48px;"><span>[</span>&#x0928;&#x094D;&#x0926;&#x0940;<span>]</span></div>
 <p id="result">Test did not run</p>
 <script>
     if (window.layoutTestController)
@@ -10,17 +10,20 @@
 
     var target = document.getElementById("target");
 
-    var textNode = target.firstChild;
+    var textNode = target.firstChild.nextSibling;
     var range = document.createRange();
     range.setStart(textNode, 0);
     range.setEnd(textNode, 2);
     var width = range.getClientRects()[0].width;
 
+    range.setStart(target, 0);
+    range.setEnd(target, 3);
+    var totalWidth = range.getBoundingClientRect().width;
+
     var reference = document.getElementById("reference");
-    textNode = reference.firstChild;
-    range.setStart(textNode, 0);
-    range.setEnd(textNode, 3);
-    var referenceWidth = range.getClientRects()[0].width;
+    range.setStart(reference, 0)
+    range.setEnd(reference, 3);
+    var referenceWidth = totalWidth - range.getBoundingClientRect().width;
 
     document.getElementById("result").innerText = width === referenceWidth ? "PASS" : "FAIL: width was " + width + " instead of " + referenceWidth;
 </script>

-- 
WebKit Debian packaging