[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
bweinstein at apple.com
bweinstein at apple.com
Wed Dec 22 16:13:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e48f166fe957c575738658931c2a6c0150a539a5
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 19 20:59:35 2010 +0000
Rebaseline fast/blockflow results for Windows after r72347.
* platform/win/fast/blockflow/japanese-ruby-horizontal-bt-expected.txt:
* platform/win/fast/blockflow/japanese-ruby-vertical-lr-expected.txt:
* platform/win/fast/blockflow/japanese-ruby-vertical-rl-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72430 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e703c02..16886fb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,13 @@
2010-11-19 Brian Weinstein <bweinstein at apple.com>
+ Rebaseline fast/blockflow results for Windows after r72347.
+
+ * platform/win/fast/blockflow/japanese-ruby-horizontal-bt-expected.txt:
+ * platform/win/fast/blockflow/japanese-ruby-vertical-lr-expected.txt:
+ * platform/win/fast/blockflow/japanese-ruby-vertical-rl-expected.txt:
+
+2010-11-19 Brian Weinstein <bweinstein at apple.com>
+
Fix failing Windows ruby tests by removing the Windows-specific results. These were the same as the Mac
results before r72347, and that change rebaselined the results in LayoutTests/platform/mac, making these
not match anymore, and causing the Windows tests to fail.
diff --git a/LayoutTests/platform/win/fast/blockflow/japanese-ruby-horizontal-bt-expected.txt b/LayoutTests/platform/win/fast/blockflow/japanese-ruby-horizontal-bt-expected.txt
index de0803a..6e5dead 100644
--- a/LayoutTests/platform/win/fast/blockflow/japanese-ruby-horizontal-bt-expected.txt
+++ b/LayoutTests/platform/win/fast/blockflow/japanese-ruby-horizontal-bt-expected.txt
@@ -6,18 +6,18 @@ layer at (0,490) size 800x110
RenderText {#text} at (0,0) size 220x46
text run at (0,0) width 220: "\x{653B}\x{6BBB} \x{6A5F}\x{52D5}\x{968A} "
RenderRuby (inline) {RUBY} at (0,0) size 200x46
- RenderRubyRun (anonymous) at (220,0) size 80x74
- RenderRubyText {RT} at (0,0) size 80x28
+ RenderRubyRun (anonymous) at (220,0) size 80x46
+ RenderRubyText {RT} at (0,46) size 80x28
RenderText {#text} at (3,0) size 74x28
text run at (3,0) width 74: "\x{3053}\x{3046}\x{304B}\x{304F}"
- RenderRubyBase (anonymous) at (0,28) size 80x46
+ RenderRubyBase (anonymous) at (0,0) size 80x46
RenderText {#text} at (0,0) size 80x46
text run at (0,0) width 80: "\x{653B}\x{6BBB}"
- RenderRubyRun (anonymous) at (300,0) size 120x74
- RenderRubyText {RT} at (0,0) size 120x28
+ RenderRubyRun (anonymous) at (300,0) size 120x46
+ RenderRubyText {RT} at (0,46) size 120x28
RenderText {#text} at (8,0) size 103x28
text run at (8,0) width 103: "\x{304D}\x{3069}\x{3046}\x{305F}\x{3044}"
- RenderRubyBase (anonymous) at (0,28) size 120x46
+ RenderRubyBase (anonymous) at (0,0) size 120x46
RenderText {#text} at (0,0) size 120x46
text run at (0,0) width 120: "\x{6A5F}\x{52D5}\x{968A}"
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/blockflow/japanese-ruby-vertical-lr-expected.txt b/LayoutTests/platform/win/fast/blockflow/japanese-ruby-vertical-lr-expected.txt
index d6bf7a5..60ba803 100644
--- a/LayoutTests/platform/win/fast/blockflow/japanese-ruby-vertical-lr-expected.txt
+++ b/LayoutTests/platform/win/fast/blockflow/japanese-ruby-vertical-lr-expected.txt
@@ -6,18 +6,18 @@ layer at (0,0) size 110x600
RenderText {#text} at (0,0) size 46x220
text run at (0,0) width 220: "\x{653B}\x{6BBB} \x{6A5F}\x{52D5}\x{968A} "
RenderRuby (inline) {RUBY} at (0,0) size 46x200
- RenderRubyRun (anonymous) at (0,220) size 74x80
- RenderRubyText {RT} at (0,0) size 28x80
+ RenderRubyRun (anonymous) at (0,220) size 46x80
+ RenderRubyText {RT} at (46,0) size 28x80
RenderText {#text} at (0,3) size 28x74
text run at (0,3) width 74: "\x{3053}\x{3046}\x{304B}\x{304F}"
- RenderRubyBase (anonymous) at (28,0) size 46x80
+ RenderRubyBase (anonymous) at (0,0) size 46x80
RenderText {#text} at (0,0) size 46x80
text run at (0,0) width 80: "\x{653B}\x{6BBB}"
- RenderRubyRun (anonymous) at (0,300) size 74x120
- RenderRubyText {RT} at (0,0) size 28x120
+ RenderRubyRun (anonymous) at (0,300) size 46x120
+ RenderRubyText {RT} at (46,0) size 28x120
RenderText {#text} at (0,8) size 28x103
text run at (0,8) width 103: "\x{304D}\x{3069}\x{3046}\x{305F}\x{3044}"
- RenderRubyBase (anonymous) at (28,0) size 46x120
+ RenderRubyBase (anonymous) at (0,0) size 46x120
RenderText {#text} at (0,0) size 46x120
text run at (0,0) width 120: "\x{6A5F}\x{52D5}\x{968A}"
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/blockflow/japanese-ruby-vertical-rl-expected.txt b/LayoutTests/platform/win/fast/blockflow/japanese-ruby-vertical-rl-expected.txt
index fb8c38d..00fa6c5 100644
--- a/LayoutTests/platform/win/fast/blockflow/japanese-ruby-vertical-rl-expected.txt
+++ b/LayoutTests/platform/win/fast/blockflow/japanese-ruby-vertical-rl-expected.txt
@@ -6,18 +6,18 @@ layer at (690,0) size 110x600
RenderText {#text} at (28,0) size 46x220
text run at (28,0) width 220: "\x{653B}\x{6BBB} \x{6A5F}\x{52D5}\x{968A} "
RenderRuby (inline) {RUBY} at (0,0) size 46x200
- RenderRubyRun (anonymous) at (0,220) size 74x80
- RenderRubyText {RT} at (0,0) size 28x80
+ RenderRubyRun (anonymous) at (28,220) size 46x80
+ RenderRubyText {RT} at (-28,0) size 28x80
RenderText {#text} at (0,3) size 28x74
text run at (0,3) width 74: "\x{3053}\x{3046}\x{304B}\x{304F}"
- RenderRubyBase (anonymous) at (28,0) size 46x80
+ RenderRubyBase (anonymous) at (0,0) size 46x80
RenderText {#text} at (0,0) size 46x80
text run at (0,0) width 80: "\x{653B}\x{6BBB}"
- RenderRubyRun (anonymous) at (0,300) size 74x120
- RenderRubyText {RT} at (0,0) size 28x120
+ RenderRubyRun (anonymous) at (28,300) size 46x120
+ RenderRubyText {RT} at (-28,0) size 28x120
RenderText {#text} at (0,8) size 28x103
text run at (0,8) width 103: "\x{304D}\x{3069}\x{3046}\x{305F}\x{3044}"
- RenderRubyBase (anonymous) at (28,0) size 46x120
+ RenderRubyBase (anonymous) at (0,0) size 46x120
RenderText {#text} at (0,0) size 46x120
text run at (0,0) width 120: "\x{6A5F}\x{52D5}\x{968A}"
RenderText {#text} at (0,0) size 0x0
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list