[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
bweinstein at apple.com
bweinstein at apple.com
Wed Dec 22 18:42:25 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 10e6dda5257a488eec82d3b1bf61a6e6a806be7a
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 16 01:16:54 2010 +0000
Rebaseline Windows XP results after r73993. Windows 7 results were landed in r73998, but some XP
rebaselines were needed as well.
* platform/win-xp/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.txt: Added.
* platform/win-xp/fast/text/international/bold-bengali-expected.txt:
* platform/win-xp/fast/text/international/complex-character-based-fallback-expected.txt:
* platform/win-xp/transforms/2d/hindi-rotated-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74166 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1cd410f..02344bf 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-15 Brian Weinstein <bweinstein at apple.com>
+
+ Rebaseline Windows XP results after r73993. Windows 7 results were landed in r73998, but some XP
+ rebaselines were needed as well.
+
+ * platform/win-xp/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.txt: Added.
+ * platform/win-xp/fast/text/international/bold-bengali-expected.txt:
+ * platform/win-xp/fast/text/international/complex-character-based-fallback-expected.txt:
+ * platform/win-xp/transforms/2d/hindi-rotated-expected.txt:
+
2010-12-15 Yong Li <yoli at rim.com>
Reviewed by Darin Adler.
diff --git a/LayoutTests/platform/win-xp/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.txt b/LayoutTests/platform/win-xp/fast/text/international/bidi-control-chars-treated-as-ZWS-expected.txt
new file mode 100755
index 0000000..662b175
--- /dev/null
+++ b/LayoutTests/platform/win-xp/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 784x43
+ 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,25) size 14x17
+ text run at (0,25) width 14: "ae\x{300}"
diff --git a/LayoutTests/platform/win-xp/fast/text/international/bold-bengali-expected.txt b/LayoutTests/platform/win-xp/fast/text/international/bold-bengali-expected.txt
index bc085b4..95a4228 100644
--- a/LayoutTests/platform/win-xp/fast/text/international/bold-bengali-expected.txt
+++ b/LayoutTests/platform/win-xp/fast/text/international/bold-bengali-expected.txt
@@ -12,11 +12,11 @@ layer at (0,0) size 800x600
RenderText {#text} at (0,0) size 738x18
text run at (0,0) width 478: "The test passes if the two words below look similar, but the top one is bold. "
text run at (478,0) width 260: "There should be no missing-glyph boxes."
- RenderBlock {P} at (0,86) size 784x18
+ RenderBlock {P} at (0,86) size 784x19
RenderInline {B} at (0,0) size 29x18
RenderText {#text} at (0,0) size 29x18
text run at (0,0) width 29: "\x{9AC}\x{9BE}\x{982}\x{9B2}\x{9BE}"
- RenderBlock {P} at (0,120) size 784x0
- RenderBlock {P} at (0,120) size 784x18
+ RenderBlock {P} at (0,121) size 784x0
+ RenderBlock {P} at (0,121) size 784x19
RenderText {#text} at (0,0) size 24x18
text run at (0,0) width 24: "\x{9AC}\x{9BE}\x{982}\x{9B2}\x{9BE}"
diff --git a/LayoutTests/platform/win-xp/fast/text/international/complex-character-based-fallback-expected.txt b/LayoutTests/platform/win-xp/fast/text/international/complex-character-based-fallback-expected.txt
index a93e723..7d8807a 100644
--- a/LayoutTests/platform/win-xp/fast/text/international/complex-character-based-fallback-expected.txt
+++ b/LayoutTests/platform/win-xp/fast/text/international/complex-character-based-fallback-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x624
+layer at (0,0) size 785x714
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x624
- RenderBlock {HTML} at (0,0) size 785x624
- RenderBody {BODY} at (8,8) size 769x600
+layer at (0,0) size 785x714
+ RenderBlock {HTML} at (0,0) size 785x714
+ RenderBody {BODY} at (8,8) size 769x690
RenderBlock {P} at (0,0) size 769x54
RenderText {#text} at (0,0) size 733x36
text run at (0,0) width 733: "This tests that complex text that requires font fallback wraps correctly. The text is Tamil, which is not covered by the"
@@ -13,23 +13,23 @@ layer at (0,0) size 785x624
RenderText {#text} at (478,18) size 751x36
text run at (478,18) width 273: " covered by the default font and is rendered"
text run at (0,36) width 50: "using it."
- RenderBlock {P} at (0,70) size 306x186 [border: (3px solid #000000)]
- RenderText {#text} at (3,3) size 265x180
- text run at (3,3) width 206: "\x{B87}\x{BA4}\x{BC1} \x{B89}\x{B99}\x{BCD}\x{B95}\x{BB3}\x{BC8}\x{BAA}\x{BCD} \x{BAA}\x{BCB}\x{BA9}\x{BCD}\x{BB1}"
- text run at (3,21) width 209: "\x{B86}\x{BB0}\x{BCD}\x{BB5}\x{BAE}\x{BC1}\x{B9F}\x{BC8}\x{BAF}\x{BB5}\x{BB0}\x{BCD}\x{B95}\x{BB3}\x{BBE}\x{BB2}\x{BCD}"
- text run at (3,39) width 265: "\x{BA4}\x{BCA}\x{B95}\x{BC1}\x{B95}\x{BCD}\x{B95}\x{BAA}\x{BCD}\x{BAA}\x{B9F}\x{BCD}\x{B9F}\x{BC1} \x{B95}\x{B9F}\x{BCD}\x{B9F}\x{BC1}\x{BAA}\x{BCD}\x{BAA}\x{BBE}\x{B9F}\x{BC1}\x{B95}\x{BB3}\x{BCD}"
- text run at (3,57) width 222: "\x{B8F}\x{BA4}\x{BC1}\x{BAE}\x{BCD} \x{B87}\x{BA9}\x{BCD}\x{BB1}\x{BBF} \x{B87}\x{BB2}\x{BB5}\x{B9A}\x{BAE}\x{BBE}\x{B95}\x{BAA}\x{BCD}"
- text run at (3,75) width 208: "\x{BAA}\x{BAF}\x{BA9}\x{BCD}\x{BAA}\x{B9F}\x{BC1}\x{BA4}\x{BCD}\x{BA4}\x{B95}\x{BCD}\x{B95}\x{BC2}\x{B9F}\x{BBF}\x{BAF} \x{B92}\x{BB0}\x{BC1}"
- text run at (3,93) width 263: "\x{BAA}\x{BA9}\x{BCD}\x{BAE}\x{BCA}\x{BB4}\x{BBF}\x{B95}\x{BCD} \x{B95}\x{BB2}\x{BC8}\x{B95}\x{BCD} \x{B95}\x{BB3}\x{B9E}\x{BCD}\x{B9A}\x{BBF}\x{BAF}\x{BA4}\x{BCD}"
- text run at (3,111) width 246: "\x{BA4}\x{BBF}\x{B9F}\x{BCD}\x{B9F}\x{BAE}\x{BBE}\x{B95}\x{BC1}\x{BAE}\x{BCD}. \x{B87}\x{B99}\x{BCD}\x{B95}\x{BC1} \x{BA8}\x{BC0}\x{B99}\x{BCD}\x{B95}\x{BB3}\x{BC1}\x{BAE}\x{BCD}"
- text run at (3,129) width 213: "\x{B89}\x{B99}\x{BCD}\x{B95}\x{BB3}\x{BC1}\x{B95}\x{BCD}\x{B95}\x{BC1} \x{BB5}\x{BBF}\x{BB0}\x{BC1}\x{BAA}\x{BCD}\x{BAA}\x{BAE}\x{BBE}\x{BA9}"
- text run at (3,147) width 207: "\x{BA4}\x{BB2}\x{BC8}\x{BAA}\x{BCD}\x{BAA}\x{BC1}\x{B95}\x{BB3}\x{BBF}\x{BB2}\x{BCD} \x{BAA}\x{BC1}\x{BA4}\x{BBF}\x{BA4}\x{BBE}\x{B95}\x{B95}\x{BCD}"
- text run at (3,165) width 109: "\x{B95}\x{B9F}\x{BCD}\x{B9F}\x{BC1}\x{BB0}\x{BC8}\x{B95}\x{BB3}\x{BCD}!"
- RenderBlock {P} at (0,272) size 769x36
+ RenderBlock {P} at (0,70) size 306x276 [border: (3px solid #000000)]
+ RenderText {#text} at (3,5) size 265x261
+ text run at (3,5) width 206: "\x{B87}\x{BA4}\x{BC1} \x{B89}\x{B99}\x{BCD}\x{B95}\x{BB3}\x{BC8}\x{BAA}\x{BCD} \x{BAA}\x{BCB}\x{BA9}\x{BCD}\x{BB1}"
+ text run at (3,32) width 209: "\x{B86}\x{BB0}\x{BCD}\x{BB5}\x{BAE}\x{BC1}\x{B9F}\x{BC8}\x{BAF}\x{BB5}\x{BB0}\x{BCD}\x{B95}\x{BB3}\x{BBE}\x{BB2}\x{BCD}"
+ text run at (3,59) width 265: "\x{BA4}\x{BCA}\x{B95}\x{BC1}\x{B95}\x{BCD}\x{B95}\x{BAA}\x{BCD}\x{BAA}\x{B9F}\x{BCD}\x{B9F}\x{BC1} \x{B95}\x{B9F}\x{BCD}\x{B9F}\x{BC1}\x{BAA}\x{BCD}\x{BAA}\x{BBE}\x{B9F}\x{BC1}\x{B95}\x{BB3}\x{BCD}"
+ text run at (3,86) width 222: "\x{B8F}\x{BA4}\x{BC1}\x{BAE}\x{BCD} \x{B87}\x{BA9}\x{BCD}\x{BB1}\x{BBF} \x{B87}\x{BB2}\x{BB5}\x{B9A}\x{BAE}\x{BBE}\x{B95}\x{BAA}\x{BCD}"
+ text run at (3,113) width 208: "\x{BAA}\x{BAF}\x{BA9}\x{BCD}\x{BAA}\x{B9F}\x{BC1}\x{BA4}\x{BCD}\x{BA4}\x{B95}\x{BCD}\x{B95}\x{BC2}\x{B9F}\x{BBF}\x{BAF} \x{B92}\x{BB0}\x{BC1}"
+ text run at (3,140) width 263: "\x{BAA}\x{BA9}\x{BCD}\x{BAE}\x{BCA}\x{BB4}\x{BBF}\x{B95}\x{BCD} \x{B95}\x{BB2}\x{BC8}\x{B95}\x{BCD} \x{B95}\x{BB3}\x{B9E}\x{BCD}\x{B9A}\x{BBF}\x{BAF}\x{BA4}\x{BCD}"
+ text run at (3,167) width 246: "\x{BA4}\x{BBF}\x{B9F}\x{BCD}\x{B9F}\x{BAE}\x{BBE}\x{B95}\x{BC1}\x{BAE}\x{BCD}. \x{B87}\x{B99}\x{BCD}\x{B95}\x{BC1} \x{BA8}\x{BC0}\x{B99}\x{BCD}\x{B95}\x{BB3}\x{BC1}\x{BAE}\x{BCD}"
+ text run at (3,194) width 213: "\x{B89}\x{B99}\x{BCD}\x{B95}\x{BB3}\x{BC1}\x{B95}\x{BCD}\x{B95}\x{BC1} \x{BB5}\x{BBF}\x{BB0}\x{BC1}\x{BAA}\x{BCD}\x{BAA}\x{BAE}\x{BBE}\x{BA9}"
+ text run at (3,221) width 207: "\x{BA4}\x{BB2}\x{BC8}\x{BAA}\x{BCD}\x{BAA}\x{BC1}\x{B95}\x{BB3}\x{BBF}\x{BB2}\x{BCD} \x{BAA}\x{BC1}\x{BA4}\x{BBF}\x{BA4}\x{BBE}\x{B95}\x{B95}\x{BCD}"
+ text run at (3,248) width 109: "\x{B95}\x{B9F}\x{BCD}\x{B9F}\x{BC1}\x{BB0}\x{BC8}\x{B95}\x{BB3}\x{BCD}!"
+ RenderBlock {P} at (0,362) size 769x36
RenderText {#text} at (0,0) size 749x36
text run at (0,0) width 749: "This is the same text but specifying a font that covers Tamil. Note that the exclamation point is rendered using the same"
text run at (0,18) width 96: "font as the text."
- RenderBlock {P} at (0,324) size 306x276 [border: (3px solid #000000)]
+ RenderBlock {P} at (0,414) size 306x276 [border: (3px solid #000000)]
RenderText {#text} at (3,3) size 273x270
text run at (3,3) width 216: "\x{B87}\x{BA4}\x{BC1} \x{B89}\x{B99}\x{BCD}\x{B95}\x{BB3}\x{BC8}\x{BAA}\x{BCD} \x{BAA}\x{BCB}\x{BA9}\x{BCD}\x{BB1}"
text run at (3,30) width 209: "\x{B86}\x{BB0}\x{BCD}\x{BB5}\x{BAE}\x{BC1}\x{B9F}\x{BC8}\x{BAF}\x{BB5}\x{BB0}\x{BCD}\x{B95}\x{BB3}\x{BBE}\x{BB2}\x{BCD}"
diff --git a/LayoutTests/platform/win-xp/transforms/2d/hindi-rotated-expected.txt b/LayoutTests/platform/win-xp/transforms/2d/hindi-rotated-expected.txt
index a8c6290..223dca2 100755
--- a/LayoutTests/platform/win-xp/transforms/2d/hindi-rotated-expected.txt
+++ b/LayoutTests/platform/win-xp/transforms/2d/hindi-rotated-expected.txt
@@ -1,9 +1,9 @@
-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 784x576
- RenderBlock {P} at (0,0) size 784x18
+layer at (0,0) size 785x610
+ RenderView at (0,0) size 785x600
+layer at (0,0) size 785x600
+ RenderBlock {HTML} at (0,0) size 785x600
+ RenderBody {BODY} at (8,8) size 769x576
+ RenderBlock {P} at (0,0) size 769x18
RenderText {#text} at (0,0) size 141x18
text run at (0,0) width 141: "This is to test a fix for "
RenderInline {A} at (0,0) size 68x18 [color=#0000EE]
@@ -11,25 +11,25 @@ layer at (0,0) size 800x600
text run at (141,0) width 68: "bug 26660"
RenderText {#text} at (209,0) size 4x18
text run at (209,0) width 4: "."
- RenderBlock {P} at (0,504) size 784x0
-layer at (8,101) size 252x38
- RenderBlock {DIV} at (0,93) size 252x38 [border: (1px solid #008000)]
- RenderText {#text} at (1,1) size 248x36
- text run at (1,1) width 248: "Straight \x{916}\x{94B}\x{91C}\x{947}\x{902} \x{92C}\x{941}\x{927}\x{935}\x{93E}\x{930} \x{915}\x{940} \x{938}\x{941}\x{92C}\x{939} \x{939}\x{94B}\x{928}\x{947} \x{935}\x{93E}\x{932}\x{93E}"
- text run at (1,19) width 77: "\x{92A}\x{942}\x{930}\x{94D}\x{923} 123 abc"
-layer at (8,214) size 252x38
- RenderBlock {DIV} at (0,206) size 252x38 [border: (1px solid #008000)]
- RenderText {#text} at (1,1) size 244x36
- text run at (1,1) width 244: "Now rotated \x{916}\x{94B}\x{91C}\x{947}\x{902} \x{92C}\x{941}\x{927}\x{935}\x{93E}\x{930} \x{915}\x{940} \x{938}\x{941}\x{92C}\x{939} \x{939}\x{94B}\x{928}\x{947}"
- text run at (1,19) width 111: "\x{935}\x{93E}\x{932}\x{93E} \x{92A}\x{942}\x{930}\x{94D}\x{923} 123 abc"
-layer at (8,327) size 252x56
- RenderBlock {DIV} at (0,319) size 252x56 [border: (1px solid #008000)]
+ RenderBlock {P} at (0,558) size 769x0
+layer at (8,101) size 252x56
+ RenderBlock {DIV} at (0,93) size 252x56 [border: (1px solid #008000)]
+ RenderText {#text} at (1,7) size 248x45
+ text run at (1,7) width 248: "Straight \x{916}\x{94B}\x{91C}\x{947}\x{902} \x{92C}\x{941}\x{927}\x{935}\x{93E}\x{930} \x{915}\x{940} \x{938}\x{941}\x{92C}\x{939} \x{939}\x{94B}\x{928}\x{947} \x{935}\x{93E}\x{932}\x{93E}"
+ text run at (1,34) width 77: "\x{92A}\x{942}\x{930}\x{94D}\x{923} 123 abc"
+layer at (8,232) size 252x56
+ RenderBlock {DIV} at (0,224) size 252x56 [border: (1px solid #008000)]
+ RenderText {#text} at (1,7) size 244x45
+ text run at (1,7) width 244: "Now rotated \x{916}\x{94B}\x{91C}\x{947}\x{902} \x{92C}\x{941}\x{927}\x{935}\x{93E}\x{930} \x{915}\x{940} \x{938}\x{941}\x{92C}\x{939} \x{939}\x{94B}\x{928}\x{947}"
+ text run at (1,34) width 111: "\x{935}\x{93E}\x{932}\x{93E} \x{92A}\x{942}\x{930}\x{94D}\x{923} 123 abc"
+layer at (8,363) size 252x56
+ RenderBlock {DIV} at (0,355) size 252x56 [border: (1px solid #008000)]
RenderText {#text} at (1,1) size 236x54
text run at (1,1) width 236: "Now rotated \x{916}\x{94B}\x{91C}\x{947}\x{902} \x{92C}\x{941}\x{927}\x{935}\x{93E}\x{930} \x{915}\x{940} \x{938}\x{941}\x{92C}\x{939}"
text run at (1,28) width 156: "\x{939}\x{94B}\x{928}\x{947} \x{935}\x{93E}\x{932}\x{93E} \x{92A}\x{942}\x{930}\x{94D}\x{923} 123 abc"
-layer at (8,458) size 252x38
- RenderBlock {DIV} at (0,450) size 252x38 [border: (1px solid #008000)]
- RenderText {#text} at (1,1) size 244x36
- text run at (1,1) width 117: "Now rotated \x{916}\x{94B}\x{91C}\x{947}\x{902} "
- text run at (118,1) width 127: "\x{92C}\x{941}\x{927}\x{935}\x{93E}\x{930} \x{915}\x{940} \x{938}\x{941}\x{92C}\x{939} \x{939}\x{94B}\x{928}\x{947}"
- text run at (1,19) width 111: "\x{935}\x{93E}\x{932}\x{93E} \x{92A}\x{942}\x{930}\x{94D}\x{923} 123 abc"
+layer at (8,494) size 252x56
+ RenderBlock {DIV} at (0,486) size 252x56 [border: (1px solid #008000)]
+ RenderText {#text} at (1,7) size 244x45
+ text run at (1,7) width 117: "Now rotated \x{916}\x{94B}\x{91C}\x{947}\x{902} "
+ text run at (118,7) width 127: "\x{92C}\x{941}\x{927}\x{935}\x{93E}\x{930} \x{915}\x{940} \x{938}\x{941}\x{92C}\x{939} \x{939}\x{94B}\x{928}\x{947}"
+ text run at (1,34) width 111: "\x{935}\x{93E}\x{932}\x{93E} \x{92A}\x{942}\x{930}\x{94D}\x{923} 123 abc"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list