[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 14:57:51 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 42d2ba72d15204a72a97418b10cd0c69164aa986
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 26 16:55:00 2010 +0000
Land expected Windows results for new vertical text tests
* platform/win/fast/blockflow/english-lr-text-expected.checksum: Added.
* platform/win/fast/blockflow/english-lr-text-expected.png: Added.
* platform/win/fast/blockflow/english-lr-text-expected.txt: Added.
* platform/win/fast/blockflow/english-rl-text-expected.checksum: Added.
* platform/win/fast/blockflow/english-rl-text-expected.png: Added.
* platform/win/fast/blockflow/english-rl-text-expected.txt: Added.
* platform/win/fast/text/international/vertical-text-glyph-test-expected.checksum: Added.
* platform/win/fast/text/international/vertical-text-glyph-test-expected.png: Added.
* platform/win/fast/text/international/vertical-text-glyph-test-expected.txt: Added.
* platform/win/fast/text/international/vertical-text-metrics-test-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70530 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 48b3fab..7119778 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-26 Adam Roben <aroben at apple.com>
+
+ Land expected Windows results for new vertical text tests
+
+ * platform/win/fast/blockflow/english-lr-text-expected.checksum: Added.
+ * platform/win/fast/blockflow/english-lr-text-expected.png: Added.
+ * platform/win/fast/blockflow/english-lr-text-expected.txt: Added.
+ * platform/win/fast/blockflow/english-rl-text-expected.checksum: Added.
+ * platform/win/fast/blockflow/english-rl-text-expected.png: Added.
+ * platform/win/fast/blockflow/english-rl-text-expected.txt: Added.
+ * platform/win/fast/text/international/vertical-text-glyph-test-expected.checksum: Added.
+ * platform/win/fast/text/international/vertical-text-glyph-test-expected.png: Added.
+ * platform/win/fast/text/international/vertical-text-glyph-test-expected.txt: Added.
+ * platform/win/fast/text/international/vertical-text-metrics-test-expected.txt: Added.
+
2010-10-26 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r70518.
diff --git a/LayoutTests/platform/win/fast/blockflow/english-lr-text-expected.checksum b/LayoutTests/platform/win/fast/blockflow/english-lr-text-expected.checksum
new file mode 100644
index 0000000..98f12a7
--- /dev/null
+++ b/LayoutTests/platform/win/fast/blockflow/english-lr-text-expected.checksum
@@ -0,0 +1 @@
+0b2855a4b1a0adf545aed1cb8700fdd7
\ No newline at end of file
diff --git a/LayoutTests/platform/win/fast/blockflow/english-lr-text-expected.png b/LayoutTests/platform/win/fast/blockflow/english-lr-text-expected.png
new file mode 100644
index 0000000..1f3fd9e
Binary files /dev/null and b/LayoutTests/platform/win/fast/blockflow/english-lr-text-expected.png differ
diff --git a/LayoutTests/platform/win/fast/blockflow/english-lr-text-expected.txt b/LayoutTests/platform/win/fast/blockflow/english-lr-text-expected.txt
new file mode 100644
index 0000000..5b12a55
--- /dev/null
+++ b/LayoutTests/platform/win/fast/blockflow/english-lr-text-expected.txt
@@ -0,0 +1,34 @@
+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 {DIV} at (0,0) size 132x500
+ RenderInline {SPAN} at (0,0) size 395x22
+ RenderText {#text} at (0,0) size 395x22
+ text run at (0,0) width 395: "This text should be rotated 90 degrees and underlined."
+ RenderText {#text} at (0,395) size 5x22
+ text run at (0,395) width 5: " "
+ RenderBR {BR} at (5,400) size 0x0
+ RenderInline {SPAN} at (0,0) size 386x22
+ RenderText {#text} at (22,0) size 386x22
+ text run at (22,0) width 386: "This text should be rotated 90 degrees and overlined."
+ RenderText {#text} at (22,386) size 5x22
+ text run at (22,386) width 5: " "
+ RenderBR {BR} at (27,391) size 0x0
+ RenderInline {SPAN} at (0,0) size 423x22
+ RenderText {#text} at (44,0) size 423x22
+ text run at (44,0) width 423: "This text should be rotated 90 degrees and struck through."
+ RenderText {#text} at (44,423) size 5x22
+ text run at (44,423) width 5: " "
+ RenderBR {BR} at (49,428) size 0x0
+ RenderInline {SPAN} at (0,0) size 449x22
+ RenderText {#text} at (66,0) size 449x22
+ text run at (66,0) width 449: "This text should have a red shadow that is offset horizontally."
+ RenderText {#text} at (66,449) size 5x22
+ text run at (66,449) width 5: " "
+ RenderBR {BR} at (71,454) size 0x0
+ RenderBR {BR} at (88,0) size 0x22
+ RenderInline {SPAN} at (0,0) size 460x22
+ RenderText {#text} at (110,0) size 460x22
+ text run at (110,0) width 460: "This text should have an overline plus horizontal green shadow"
diff --git a/LayoutTests/platform/win/fast/blockflow/english-rl-text-expected.checksum b/LayoutTests/platform/win/fast/blockflow/english-rl-text-expected.checksum
new file mode 100644
index 0000000..9c637f4
--- /dev/null
+++ b/LayoutTests/platform/win/fast/blockflow/english-rl-text-expected.checksum
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..2593954
Binary files /dev/null and b/LayoutTests/platform/win/fast/blockflow/english-rl-text-expected.png 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
new file mode 100644
index 0000000..a0a2066
--- /dev/null
+++ b/LayoutTests/platform/win/fast/blockflow/english-rl-text-expected.txt
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000..9ca913c
--- /dev/null
+++ b/LayoutTests/platform/win/fast/text/international/vertical-text-glyph-test-expected.checksum
@@ -0,0 +1 @@
+161c1560d0ab1f8887969ebf1c566826
\ 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
new file mode 100644
index 0000000..4d033a1
Binary files /dev/null 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
new file mode 100644
index 0000000..9384b62
--- /dev/null
+++ b/LayoutTests/platform/win/fast/text/international/vertical-text-glyph-test-expected.txt
@@ -0,0 +1,25 @@
+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)]
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
new file mode 100644
index 0000000..ad05aa2
--- /dev/null
+++ b/LayoutTests/platform/win/fast/text/international/vertical-text-metrics-test-expected.txt
@@ -0,0 +1,23 @@
+Simple text path
+
+abあ「」。
+abあ「」。
+abあ「」。
+abあ「」。
+
+Complex text path
+
+abあ「」。1⃝
+abあ「」。1⃝
+abあ「」。1⃝
+abあ「」。1⃝
+
+width=64
+width=64
+width=22
+width=22
+width=86
+width=86
+width=22
+width=22
+
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list