[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

aroben at apple.com aroben at apple.com
Wed Dec 22 15:44:04 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit ef91d4a7c14ae6a26cf15cd0944b1553dde59b77
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 11 13:23:45 2010 +0000

    Update Windows results after r71566 and r71783
    
    <http://webkit.org/b/49378> covers the
    justification-padding-mid-word.html failure. The other test seems to be
    passing (the two lines are the same width), but the text is slightly
    lower than on Mac.
    
    * platform/win/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.checksum: Added.
    * platform/win/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.png: Added.
    * platform/win/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.txt: Added.
    * platform/win/fast/text/justification-padding-mid-word-expected.txt: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71809 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 767894d..9a34ebb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-11  Adam Roben  <aroben at apple.com>
+
+        Update Windows results after r71566 and r71783
+
+        <http://webkit.org/b/49378> covers the
+        justification-padding-mid-word.html failure. The other test seems to be
+        passing (the two lines are the same width), but the text is slightly
+        lower than on Mac.
+
+        * platform/win/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.checksum: Added.
+        * platform/win/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.png: Added.
+        * platform/win/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.txt: Added.
+        * platform/win/fast/text/justification-padding-mid-word-expected.txt: Added.
+
 2010-11-11  Andreas Kling  <kling at webkit.org>
 
         Unreviewed, remove SL-specific failure result for canvas test 2d.drawImage.null since it now passes.
diff --git a/LayoutTests/platform/win/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.checksum b/LayoutTests/platform/win/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.checksum
new file mode 100644
index 0000000..1fef0bf
--- /dev/null
+++ b/LayoutTests/platform/win/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.checksum
@@ -0,0 +1 @@
+c9e1000302560cc96b1c26bf9e5a99c0
\ No newline at end of file
diff --git a/LayoutTests/platform/win/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.png b/LayoutTests/platform/win/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.png
new file mode 100644
index 0000000..5591b9f
Binary files /dev/null and b/LayoutTests/platform/win/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.png differ
diff --git a/LayoutTests/platform/win/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.txt b/LayoutTests/platform/win/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.txt
new file mode 100644
index 0000000..3306ec2
--- /dev/null
+++ b/LayoutTests/platform/win/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.txt
@@ -0,0 +1,16 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock (anonymous) at (0,0) size 784x36
+        RenderText {#text} at (0,0) size 751x36
+          text run at (0,0) width 751: "This tests that Unicode bidi control characters are not rendered and have zero width. The next two lines should look the"
+          text run at (0,18) width 36: "same."
+      RenderBlock {DIV} at (0,36) size 784x40
+        RenderText {#text} at (0,4) size 14x17
+          text run at (0,4) width 7: "a"
+          text run at (7,4) width 7 LTR override: "\x{202D}e\x{300}"
+        RenderBR {BR} at (14,18) size 0x0
+        RenderText {#text} at (0,22) size 14x17
+          text run at (0,22) width 14: "ae\x{300}"
diff --git a/LayoutTests/platform/win/fast/text/justification-padding-mid-word-expected.txt b/LayoutTests/platform/win/fast/text/justification-padding-mid-word-expected.txt
new file mode 100644
index 0000000..faa3170
--- /dev/null
+++ b/LayoutTests/platform/win/fast/text/justification-padding-mid-word-expected.txt
@@ -0,0 +1,3 @@
+a­b c de
+a­b c de
+FAIL

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list