[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:00:39 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 245b41af6e805c54aff2f2a757654b619533480a
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 10:22:53 2010 +0000

    Update Windows results for vertical-text tests after r70569
    
    * platform/win/fast/blockflow/english-rl-text-expected.checksum: Removed.
    * platform/win/fast/blockflow/english-rl-text-expected.png: Removed.
    * platform/win/fast/blockflow/english-rl-text-expected.txt: Removed.
    * platform/win/fast/text/international/vertical-text-glyph-test-expected.checksum:
    * platform/win/fast/text/international/vertical-text-glyph-test-expected.png:
    * platform/win/fast/text/international/vertical-text-glyph-test-expected.txt:
    * platform/win/fast/text/international/vertical-text-metrics-test-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70630 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0bf4e82..d6fbfef 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-27  Adam Roben  <aroben at apple.com>
+
+        Update Windows results for vertical-text tests after r70569
+
+        * platform/win/fast/blockflow/english-rl-text-expected.checksum: Removed.
+        * platform/win/fast/blockflow/english-rl-text-expected.png: Removed.
+        * platform/win/fast/blockflow/english-rl-text-expected.txt: Removed.
+        * platform/win/fast/text/international/vertical-text-glyph-test-expected.checksum:
+        * platform/win/fast/text/international/vertical-text-glyph-test-expected.png:
+        * platform/win/fast/text/international/vertical-text-glyph-test-expected.txt:
+        * platform/win/fast/text/international/vertical-text-metrics-test-expected.txt:
+
 2010-10-27  Mikhail Naganov  <mnaganov at chromium.org>
 
         [Chromium] Unreviewed test expectations update -- add test results for Mac after r70619.
diff --git a/LayoutTests/platform/win/fast/blockflow/english-rl-text-expected.checksum b/LayoutTests/platform/win/fast/blockflow/english-rl-text-expected.checksum
deleted file mode 100644
index 9c637f4..0000000
--- a/LayoutTests/platform/win/fast/blockflow/english-rl-text-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-8160fed77f46066a04b720091c0bb4bf
\ No newline at end of file
diff --git a/LayoutTests/platform/win/fast/blockflow/english-rl-text-expected.png b/LayoutTests/platform/win/fast/blockflow/english-rl-text-expected.png
deleted file mode 100644
index 2593954..0000000
Binary files a/LayoutTests/platform/win/fast/blockflow/english-rl-text-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/win/fast/blockflow/english-rl-text-expected.txt b/LayoutTests/platform/win/fast/blockflow/english-rl-text-expected.txt
deleted file mode 100644
index a0a2066..0000000
--- a/LayoutTests/platform/win/fast/blockflow/english-rl-text-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 785x600
-  RenderBlock {HTML} at (0,0) size 785x600
-    RenderBody {BODY} at (8,8) size 504x584 [border: (2px solid #000000)]
-      RenderBlock {DIV} at (18,2) size 204x580 [border: (2px solid #800000)]
-        RenderBlock (floating) {DIV} at (2,478) size 100x100 [bgcolor=#00FF00]
-        RenderText {#text} at (2,2) size 280x18
-          text run at (2,2) width 280: "Here is some text in a vertical-rl block flow. "
-          text run at (2,282) width 192: "The block direction is right-to-"
-          text run at (20,2) width 24: "left."
-        RenderBR {BR} at (34,26) size 0x0
-        RenderText {#text} at (38,2) size 203x18
-          text run at (38,2) width 203: "This line should also be vertical."
diff --git a/LayoutTests/platform/win/fast/text/international/vertical-text-glyph-test-expected.checksum b/LayoutTests/platform/win/fast/text/international/vertical-text-glyph-test-expected.checksum
index 9ca913c..e32ff36 100644
--- a/LayoutTests/platform/win/fast/text/international/vertical-text-glyph-test-expected.checksum
+++ b/LayoutTests/platform/win/fast/text/international/vertical-text-glyph-test-expected.checksum
@@ -1 +1 @@
-161c1560d0ab1f8887969ebf1c566826
\ No newline at end of file
+04a0dc365371821e4e6900828d0c41c9
\ No newline at end of file
diff --git a/LayoutTests/platform/win/fast/text/international/vertical-text-glyph-test-expected.png b/LayoutTests/platform/win/fast/text/international/vertical-text-glyph-test-expected.png
index 4d033a1..4ad477f 100644
Binary files a/LayoutTests/platform/win/fast/text/international/vertical-text-glyph-test-expected.png and b/LayoutTests/platform/win/fast/text/international/vertical-text-glyph-test-expected.png differ
diff --git a/LayoutTests/platform/win/fast/text/international/vertical-text-glyph-test-expected.txt b/LayoutTests/platform/win/fast/text/international/vertical-text-glyph-test-expected.txt
index 9384b62..5b2ad69 100644
--- a/LayoutTests/platform/win/fast/text/international/vertical-text-glyph-test-expected.txt
+++ b/LayoutTests/platform/win/fast/text/international/vertical-text-glyph-test-expected.txt
@@ -1,25 +1,22 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x351
-  RenderBlock {HTML} at (0,0) size 800x351
-    RenderBody {BODY} at (8,18) size 784x324
-      RenderBlock {P} at (0,0) size 784x22
-        RenderText {#text} at (0,0) size 119x22
-          text run at (0,0) width 119: "Simple text path"
-      RenderBlock (anonymous) at (0,40) size 784x91
-        RenderBlock {SPAN} at (0,0) size 22x64
-          RenderText {#text} at (0,0) size 64x22
-            text run at (0,0) width 64: "ab\x{3042}\x{300C}\x{300D}\x{3002}"
-        RenderBR {BR} at (22,47) size 0x22
-        RenderBR {BR} at (0,69) size 0x22
-      RenderBlock {HR} at (0,140) size 784x2 [border: (1px inset #000000)]
-      RenderBlock {P} at (0,160) size 784x22
-        RenderText {#text} at (0,0) size 134x22
-          text run at (0,0) width 134: "Complex text path"
-      RenderBlock (anonymous) at (0,200) size 784x113
-        RenderBlock {SPAN} at (0,0) size 22x86
-          RenderText {#text} at (0,0) size 86x22
-            text run at (0,0) width 86: "ab\x{3042}\x{300C}\x{300D}\x{3002}1\x{20DD}"
-        RenderBR {BR} at (22,69) size 0x22
-        RenderBR {BR} at (0,91) size 0x22
-      RenderBlock {HR} at (0,322) size 784x2 [border: (1px inset #000000)]
+layer at (0,0) size 800x518
+  RenderBlock {HTML} at (0,0) size 800x518
+    RenderBody {BODY} at (8,21) size 784x489
+      RenderBlock {P} at (0,0) size 784x24
+        RenderText {#text} at (0,0) size 139x24
+          text run at (0,0) width 139: "Simple text path"
+      RenderBlock (anonymous) at (0,45) size 784x183
+        RenderBlock {SPAN} at (0,0) size 24x178
+          RenderText {#text} at (0,0) size 178x24
+            text run at (0,0) width 178: "string\x{300C}\x{3042}\x{3001}\x{5909}\x{3063}\x{FF01}\x{300D}\x{3002}"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {HR} at (0,238) size 784x2 [border: (1px inset #000000)]
+      RenderBlock {P} at (0,261) size 784x24
+        RenderText {#text} at (0,0) size 157x24
+          text run at (0,0) width 157: "Complex text path"
+      RenderBlock (anonymous) at (0,306) size 784x183
+        RenderBlock {SPAN} at (0,0) size 24x178
+          RenderText {#text} at (0,0) size 178x24
+            text run at (0,0) width 178: "string\x{300C}\x{3042}\x{3001}\x{5909}\x{3063}\x{FF01}\x{300D}\x{3002}"
+        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/text/international/vertical-text-metrics-test-expected.txt b/LayoutTests/platform/win/fast/text/international/vertical-text-metrics-test-expected.txt
index ad05aa2..58af0d9 100644
--- a/LayoutTests/platform/win/fast/text/international/vertical-text-metrics-test-expected.txt
+++ b/LayoutTests/platform/win/fast/text/international/vertical-text-metrics-test-expected.txt
@@ -1,23 +1,23 @@
 Simple text path
 
-abあ「」。
-abあ「」。
-abあ「」。
-abあ「」。
+string「あ、変っ!」。
+string「あ、変っ!」。
+string「あ、変っ!」。
+string「あ、変っ!」。
 
 Complex text path
 
-abあ「」。1⃝
-abあ「」。1⃝
-abあ「」。1⃝
-abあ「」。1⃝
+string「あ、変っ!」。
+string「あ、変っ!」。
+string「あ、変っ!」。
+string「あ、変っ!」。
 
-width=64
-width=64
-width=22
-width=22
-width=86
-width=86
-width=22
-width=22
+width=178
+width=178
+width=24
+width=24
+width=178
+width=178
+width=24
+width=24
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list