[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mrobinson at webkit.org
mrobinson at webkit.org
Wed Dec 22 15:06:05 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7c6403a43e8c81e7110b5ff82fb0585204c2a50b
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 27 22:38:31 2010 +0000
2010-10-27 Martin Robinson <mrobinson at igalia.com>
Rebaseline some GTK+ tests after r70688.
* platform/gtk/fast/css/font-face-opentype-expected.txt:
* platform/gtk/fast/forms/select-visual-hebrew-expected.txt:
* platform/gtk/fast/forms/select-writing-direction-natural-expected.txt:
* platform/gtk/fast/forms/visual-hebrew-text-field-expected.txt:
* platform/gtk/fast/text/backslash-to-yen-sign-euc-expected.txt:
* platform/gtk/fast/text/backslash-to-yen-sign-expected.txt:
* platform/gtk/fast/text/international/plane2-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70721 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 08d432e..7cbdd63 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-27 Martin Robinson <mrobinson at igalia.com>
+
+ Rebaseline some GTK+ tests after r70688.
+
+ * platform/gtk/fast/css/font-face-opentype-expected.txt:
+ * platform/gtk/fast/forms/select-visual-hebrew-expected.txt:
+ * platform/gtk/fast/forms/select-writing-direction-natural-expected.txt:
+ * platform/gtk/fast/forms/visual-hebrew-text-field-expected.txt:
+ * platform/gtk/fast/text/backslash-to-yen-sign-euc-expected.txt:
+ * platform/gtk/fast/text/backslash-to-yen-sign-expected.txt:
+ * platform/gtk/fast/text/international/plane2-expected.txt:
+
2010-10-27 Adam Barth <abarth at webkit.org>
Reviewed by Ojan Vafai.
diff --git a/LayoutTests/platform/gtk/fast/css/font-face-opentype-expected.txt b/LayoutTests/platform/gtk/fast/css/font-face-opentype-expected.txt
index 61870ab..c61de4d 100644
--- a/LayoutTests/platform/gtk/fast/css/font-face-opentype-expected.txt
+++ b/LayoutTests/platform/gtk/fast/css/font-face-opentype-expected.txt
@@ -33,9 +33,9 @@ layer at (0,0) size 800x600
text run at (0,0) width 768: "Check if glyphs not in Ahem.otf can be rendered using a fallback font. If the test passes, you should see a single-quote character"
text run at (0,19) width 40: "below:"
RenderBlock (anonymous) at (0,193) size 784x17
- RenderInline {SPAN} at (0,0) size 16x17
- RenderText {#text} at (0,0) size 16x17
- text run at (0,0) width 16: "'"
+ RenderInline {SPAN} at (0,0) size 3x17
+ RenderText {#text} at (0,0) size 3x17
+ text run at (0,0) width 3: "'"
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/forms/select-visual-hebrew-expected.txt b/LayoutTests/platform/gtk/fast/forms/select-visual-hebrew-expected.txt
index 5140926..191098c 100644
--- a/LayoutTests/platform/gtk/fast/forms/select-visual-hebrew-expected.txt
+++ b/LayoutTests/platform/gtk/fast/forms/select-visual-hebrew-expected.txt
@@ -4,13 +4,13 @@ layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 677x19
- text run at (0,0) width 677 LTR override: "This tests that native pop-ups are rendered in logical order even in visually-ordered Hebrew pages."
+ RenderText {#text} at (0,0) size 766x19
+ text run at (0,0) width 766 LTR override: "This tests that native pop-ups are rendered in logical order even in visually-ordered Hebrew pages."
RenderBlock {HR} at (0,35) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,53) size 784x19
- RenderText {#text} at (0,0) size 411x19
- text run at (0,0) width 368 LTR override: "Text on the pop-up and in the list should look like this: "
- text run at (368,0) width 43 LTR override: "\x{5E8}\x{5D5}\x{5EA}\x{5E4}\x{5DB}"
+ RenderText {#text} at (0,0) size 467x19
+ text run at (0,0) width 424 LTR override: "Text on the pop-up and in the list should look like this: "
+ text run at (424,0) width 43 LTR override: "\x{5E8}\x{5D5}\x{5EA}\x{5E4}\x{5DB}"
RenderBlock (anonymous) at (0,88) size 784x29
RenderMenuList {SELECT} at (2,2) size 66x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 64x23
diff --git a/LayoutTests/platform/gtk/fast/forms/select-writing-direction-natural-expected.txt b/LayoutTests/platform/gtk/fast/forms/select-writing-direction-natural-expected.txt
index 20cf5fc..5be6764 100644
--- a/LayoutTests/platform/gtk/fast/forms/select-writing-direction-natural-expected.txt
+++ b/LayoutTests/platform/gtk/fast/forms/select-writing-direction-natural-expected.txt
@@ -4,103 +4,104 @@ layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x38
- RenderText {#text} at (0,0) size 56x19
- text run at (0,0) width 56: "Test for "
- RenderInline {I} at (0,0) size 770x38
- RenderInline {A} at (0,0) size 323x19 [color=#0000EE]
- RenderText {#text} at (56,0) size 323x19
- text run at (56,0) width 323: "http://bugs.webkit.org/show_bug.cgi?id=13775"
- RenderText {#text} at (379,0) size 770x38
- text run at (379,0) width 4: " "
- text run at (383,0) width 387: "REGRESSION: Popup button text should use \"natural\""
- text run at (0,19) width 361: "directionality to match the items in the popup menu"
- RenderText {#text} at (361,19) size 4x19
- text run at (361,19) width 4: "."
- RenderBlock {P} at (0,54) size 784x19
- RenderText {#text} at (0,0) size 704x19
- text run at (0,0) width 539: "In all of the popup buttons below, the letter A should be on the left and the letter "
- text run at (539,0) width 10 RTL: "\x{5D0}"
- text run at (549,0) width 155: " should be on the right."
- RenderBlock {DIV} at (0,89) size 784x58
+ RenderText {#text} at (0,0) size 66x19
+ text run at (0,0) width 66: "Test for "
+ RenderInline {I} at (0,0) size 755x38
+ RenderInline {A} at (0,0) size 370x19 [color=#0000EE]
+ RenderText {#text} at (66,0) size 370x19
+ text run at (66,0) width 370: "http://bugs.webkit.org/show_bug.cgi?id=13775"
+ RenderText {#text} at (436,0) size 755x38
+ text run at (436,0) width 5: " "
+ text run at (441,0) width 314: "REGRESSION: Popup button text should"
+ text run at (0,19) width 505: "use \"natural\" directionality to match the items in the popup menu"
+ RenderText {#text} at (505,19) size 5x19
+ text run at (505,19) width 5: "."
+ RenderBlock {P} at (0,54) size 784x38
+ RenderText {#text} at (0,0) size 778x38
+ text run at (0,0) width 632: "In all of the popup buttons below, the letter A should be on the left and the letter "
+ text run at (632,0) width 10 RTL: "\x{5D0}"
+ text run at (642,0) width 136: " should be on the"
+ text run at (0,19) width 41: "right."
+ RenderBlock {DIV} at (0,108) size 784x58
RenderBlock {DIV} at (0,0) size 784x29
RenderMenuList {SELECT} at (0,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 68x23
RenderText at (2,2) size 21x19
text run at (2,2) width 11: "A"
text run at (13,2) width 10 RTL: "\x{5D0}"
- RenderText {#text} at (70,5) size 4x19
- text run at (70,5) width 4: " "
- RenderMenuList {SELECT} at (74,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderText {#text} at (70,5) size 5x19
+ text run at (70,5) width 5: " "
+ RenderMenuList {SELECT} at (75,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 68x23
RenderText at (2,2) size 21x19
text run at (2,2) width 11: "A"
text run at (13,2) width 10 RTL: "\x{5D0}"
- RenderText {#text} at (144,5) size 4x19
- text run at (144,5) width 4: " "
- RenderMenuList {SELECT} at (148,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderText {#text} at (145,5) size 5x19
+ text run at (145,5) width 5: " "
+ RenderMenuList {SELECT} at (150,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 68x23
RenderText at (2,2) size 26x19
text run at (2,2) width 11: "A"
text run at (13,2) width 15 RTL: "(\x{5D0}"
- RenderText {#text} at (218,5) size 4x19
- text run at (218,5) width 4: " "
- RenderMenuList {SELECT} at (222,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderText {#text} at (220,5) size 5x19
+ text run at (220,5) width 5: " "
+ RenderMenuList {SELECT} at (225,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 68x23
RenderText at (2,2) size 26x19
text run at (2,2) width 16: "(A"
text run at (18,2) width 10 RTL: "\x{5D0}"
RenderText {#text} at (0,0) size 0x0
RenderBlock {DIV} at (0,29) size 784x29
- RenderMenuList {SELECT} at (492,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderMenuList {SELECT} at (489,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 68x23
RenderText at (2,2) size 21x19
text run at (2,2) width 11: "A"
text run at (13,2) width 10 RTL: "\x{5D0}"
- RenderText {#text} at (562,5) size 4x19
- text run at (562,5) width 4: " "
- RenderMenuList {SELECT} at (566,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderText {#text} at (559,5) size 5x19
+ text run at (559,5) width 5: " "
+ RenderMenuList {SELECT} at (564,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 68x23
RenderText at (2,2) size 21x19
text run at (2,2) width 11: "A"
text run at (13,2) width 10 RTL: "\x{5D0}"
- RenderText {#text} at (636,5) size 4x19
- text run at (636,5) width 4: " "
- RenderMenuList {SELECT} at (640,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderText {#text} at (634,5) size 5x19
+ text run at (634,5) width 5: " "
+ RenderMenuList {SELECT} at (639,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 68x23
RenderText at (2,2) size 26x19
text run at (2,2) width 11: "A"
text run at (13,2) width 15 RTL: "(\x{5D0}"
- RenderText {#text} at (710,5) size 4x19
- text run at (710,5) width 4: " "
+ RenderText {#text} at (709,5) size 5x19
+ text run at (709,5) width 5: " "
RenderMenuList {SELECT} at (714,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 68x23
RenderText at (2,2) size 26x19
text run at (2,2) width 16: "(A"
text run at (18,2) width 10 RTL: "\x{5D0}"
RenderText {#text} at (0,0) size 0x0
- RenderBlock {DIV} at (0,147) size 784x58
+ RenderBlock {DIV} at (0,166) size 784x58
RenderBlock {DIV} at (0,0) size 784x29
- RenderMenuList {SELECT} at (222,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderMenuList {SELECT} at (225,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 68x23
RenderText at (19,2) size 21x19
text run at (19,2) width 11: "A"
text run at (30,2) width 10 RTL: "\x{5D0}"
- RenderText {#text} at (218,5) size 4x19
- text run at (218,5) width 4 RTL: " "
- RenderMenuList {SELECT} at (148,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderText {#text} at (220,5) size 5x19
+ text run at (220,5) width 5 RTL: " "
+ RenderMenuList {SELECT} at (150,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 68x23
RenderText at (19,2) size 21x19
text run at (19,2) width 11: "A"
text run at (30,2) width 10 RTL: "\x{5D0}"
- RenderText {#text} at (144,5) size 4x19
- text run at (144,5) width 4 RTL: " "
- RenderMenuList {SELECT} at (74,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderText {#text} at (145,5) size 5x19
+ text run at (145,5) width 5 RTL: " "
+ RenderMenuList {SELECT} at (75,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 68x23
RenderText at (19,2) size 26x19
text run at (19,2) width 11: "A"
text run at (30,2) width 15 RTL: "(\x{5D0}"
- RenderText {#text} at (70,5) size 4x19
- text run at (70,5) width 4 RTL: " "
+ RenderText {#text} at (70,5) size 5x19
+ text run at (70,5) width 5 RTL: " "
RenderMenuList {SELECT} at (0,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 68x23
RenderText at (19,2) size 26x19
@@ -113,23 +114,23 @@ layer at (0,0) size 800x600
RenderText at (19,2) size 21x19
text run at (19,2) width 11: "A"
text run at (30,2) width 10 RTL: "\x{5D0}"
- RenderText {#text} at (710,5) size 4x19
- text run at (710,5) width 4 RTL: " "
- RenderMenuList {SELECT} at (640,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderText {#text} at (709,5) size 5x19
+ text run at (709,5) width 5 RTL: " "
+ RenderMenuList {SELECT} at (639,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 68x23
RenderText at (19,2) size 21x19
text run at (19,2) width 11: "A"
text run at (30,2) width 10 RTL: "\x{5D0}"
- RenderText {#text} at (636,5) size 4x19
- text run at (636,5) width 4 RTL: " "
- RenderMenuList {SELECT} at (566,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderText {#text} at (634,5) size 5x19
+ text run at (634,5) width 5 RTL: " "
+ RenderMenuList {SELECT} at (564,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 68x23
RenderText at (19,2) size 26x19
text run at (19,2) width 11: "A"
text run at (30,2) width 15 RTL: "(\x{5D0}"
- RenderText {#text} at (562,5) size 4x19
- text run at (562,5) width 4 RTL: " "
- RenderMenuList {SELECT} at (492,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderText {#text} at (559,5) size 5x19
+ text run at (559,5) width 5 RTL: " "
+ RenderMenuList {SELECT} at (489,2) size 70x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 68x23
RenderText at (19,2) size 26x19
text run at (19,2) width 16: "(A"
diff --git a/LayoutTests/platform/gtk/fast/forms/visual-hebrew-text-field-expected.txt b/LayoutTests/platform/gtk/fast/forms/visual-hebrew-text-field-expected.txt
index 4a859b8..37e749f 100644
--- a/LayoutTests/platform/gtk/fast/forms/visual-hebrew-text-field-expected.txt
+++ b/LayoutTests/platform/gtk/fast/forms/visual-hebrew-text-field-expected.txt
@@ -4,22 +4,21 @@ layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x38
- RenderText {#text} at (0,0) size 238x19
- text run at (0,0) width 238 LTR override: "This tests for a regression against "
- RenderInline {I} at (0,0) size 773x38
- RenderInline {A} at (0,0) size 372x19 [color=#0000EE]
- RenderText {#text} at (238,0) size 372x19
- text run at (238,0) width 372 LTR override: "http://bugzilla.opendarwin.org/show_bug.cgi?id=8076"
- RenderText {#text} at (610,0) size 773x38
- text run at (610,0) width 163 LTR override: " REGRESSION: native"
- text run at (0,19) width 345 LTR override: "text fields are reversed on \"visual Hebrew\" pages"
- RenderText {#text} at (345,19) size 4x19
- text run at (345,19) width 4 LTR override: "."
+ RenderText {#text} at (0,0) size 271x19
+ text run at (0,0) width 271 LTR override: "This tests for a regression against "
+ RenderInline {I} at (0,0) size 690x38
+ RenderInline {A} at (0,0) size 419x19 [color=#0000EE]
+ RenderText {#text} at (271,0) size 419x19
+ text run at (271,0) width 419 LTR override: "http://bugzilla.opendarwin.org/show_bug.cgi?id=8076"
+ RenderText {#text} at (0,19) size 547x19
+ text run at (0,19) width 547 LTR override: "REGRESSION: native text fields are reversed on \"visual Hebrew\" pages"
+ RenderText {#text} at (547,19) size 5x19
+ text run at (547,19) width 5 LTR override: "."
RenderBlock {HR} at (0,54) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,72) size 784x19
- RenderText {#text} at (0,0) size 292x19
- text run at (0,0) width 249 LTR override: "Text in the field should look like this: "
- text run at (249,0) width 43 LTR override: "\x{5E8}\x{5D5}\x{5EA}\x{5E4}\x{5DB}"
+ RenderText {#text} at (0,0) size 327x19
+ text run at (0,0) width 284 LTR override: "Text in the field should look like this: "
+ text run at (284,0) width 43 LTR override: "\x{5E8}\x{5D5}\x{5EA}\x{5E4}\x{5DB}"
RenderBlock (anonymous) at (0,107) size 784x29
RenderTextControl {INPUT} at (2,2) size 194x25 [bgcolor=#FFFFFF]
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/text/backslash-to-yen-sign-euc-expected.txt b/LayoutTests/platform/gtk/fast/text/backslash-to-yen-sign-euc-expected.txt
index fe966b8..f420873 100644
--- a/LayoutTests/platform/gtk/fast/text/backslash-to-yen-sign-euc-expected.txt
+++ b/LayoutTests/platform/gtk/fast/text/backslash-to-yen-sign-euc-expected.txt
@@ -79,70 +79,70 @@ layer at (0,0) size 781x738
RenderText {#text} at (311,0) size 8x19
text run at (311,0) width 8: "\x{A5}"
RenderBlock {DIV} at (0,114) size 765x19
- RenderInline {SPAN} at (0,0) size 313x19
- RenderText {#text} at (0,0) size 297x19
- text run at (0,0) width 297: "Using font \"\x{FF2D}\x{FF33} \x{FF30}\x{30B4}\x{30B7}\x{30C3}\x{30AF}\". expected: yen sign, actual: \x{A5}"
+ RenderInline {SPAN} at (0,0) size 341x19
+ RenderText {#text} at (0,0) size 325x19
+ text run at (0,0) width 325: "Using font \"\x{FF2D}\x{FF33} \x{FF30}\x{30B4}\x{30B7}\x{30C3}\x{30AF}\". expected: yen sign, actual: \x{A5}"
RenderInline {SPAN} at (0,0) size 8x19
- RenderText {#text} at (297,0) size 8x19
- text run at (297,0) width 8: "\x{A5}"
+ RenderText {#text} at (325,0) size 8x19
+ text run at (325,0) width 8: "\x{A5}"
RenderInline {SPAN} at (0,0) size 8x19
- RenderText {#text} at (305,0) size 8x19
- text run at (305,0) width 8: "\x{A5}"
+ RenderText {#text} at (333,0) size 8x19
+ text run at (333,0) width 8: "\x{A5}"
RenderInline {SPAN} at (0,0) size 8x19
- RenderText {#text} at (313,0) size 8x19
- text run at (313,0) width 8: "\x{A5}"
+ RenderText {#text} at (341,0) size 8x19
+ text run at (341,0) width 8: "\x{A5}"
RenderBlock {DIV} at (0,133) size 765x19
- RenderInline {SPAN} at (0,0) size 307x19
- RenderText {#text} at (0,0) size 291x19
- text run at (0,0) width 291: "Using font \"\x{FF2D}\x{FF33} \x{30B4}\x{30B7}\x{30C3}\x{30AF}\". expected: yen sign, actual: \x{A5}"
+ RenderInline {SPAN} at (0,0) size 331x19
+ RenderText {#text} at (0,0) size 315x19
+ text run at (0,0) width 315: "Using font \"\x{FF2D}\x{FF33} \x{30B4}\x{30B7}\x{30C3}\x{30AF}\". expected: yen sign, actual: \x{A5}"
RenderInline {SPAN} at (0,0) size 8x19
- RenderText {#text} at (291,0) size 8x19
- text run at (291,0) width 8: "\x{A5}"
+ RenderText {#text} at (315,0) size 8x19
+ text run at (315,0) width 8: "\x{A5}"
RenderInline {SPAN} at (0,0) size 8x19
- RenderText {#text} at (299,0) size 8x19
- text run at (299,0) width 8: "\x{A5}"
+ RenderText {#text} at (323,0) size 8x19
+ text run at (323,0) width 8: "\x{A5}"
RenderInline {SPAN} at (0,0) size 8x19
- RenderText {#text} at (307,0) size 8x19
- text run at (307,0) width 8: "\x{A5}"
+ RenderText {#text} at (331,0) size 8x19
+ text run at (331,0) width 8: "\x{A5}"
RenderBlock {DIV} at (0,152) size 765x19
- RenderInline {SPAN} at (0,0) size 301x19
- RenderText {#text} at (0,0) size 285x19
- text run at (0,0) width 285: "Using font \"\x{FF2D}\x{FF33} \x{FF30}\x{660E}\x{671D}\". expected: yen sign, actual: \x{A5}"
+ RenderInline {SPAN} at (0,0) size 321x19
+ RenderText {#text} at (0,0) size 305x19
+ text run at (0,0) width 305: "Using font \"\x{FF2D}\x{FF33} \x{FF30}\x{660E}\x{671D}\". expected: yen sign, actual: \x{A5}"
RenderInline {SPAN} at (0,0) size 8x19
- RenderText {#text} at (285,0) size 8x19
- text run at (285,0) width 8: "\x{A5}"
+ RenderText {#text} at (305,0) size 8x19
+ text run at (305,0) width 8: "\x{A5}"
RenderInline {SPAN} at (0,0) size 8x19
- RenderText {#text} at (293,0) size 8x19
- text run at (293,0) width 8: "\x{A5}"
+ RenderText {#text} at (313,0) size 8x19
+ text run at (313,0) width 8: "\x{A5}"
RenderInline {SPAN} at (0,0) size 8x19
- RenderText {#text} at (301,0) size 8x19
- text run at (301,0) width 8: "\x{A5}"
+ RenderText {#text} at (321,0) size 8x19
+ text run at (321,0) width 8: "\x{A5}"
RenderBlock {DIV} at (0,171) size 765x19
- RenderInline {SPAN} at (0,0) size 295x19
- RenderText {#text} at (0,0) size 279x19
- text run at (0,0) width 279: "Using font \"\x{FF2D}\x{FF33} \x{660E}\x{671D}\". expected: yen sign, actual: \x{A5}"
+ RenderInline {SPAN} at (0,0) size 311x19
+ RenderText {#text} at (0,0) size 295x19
+ text run at (0,0) width 295: "Using font \"\x{FF2D}\x{FF33} \x{660E}\x{671D}\". expected: yen sign, actual: \x{A5}"
RenderInline {SPAN} at (0,0) size 8x19
- RenderText {#text} at (279,0) size 8x19
- text run at (279,0) width 8: "\x{A5}"
+ RenderText {#text} at (295,0) size 8x19
+ text run at (295,0) width 8: "\x{A5}"
RenderInline {SPAN} at (0,0) size 8x19
- RenderText {#text} at (287,0) size 8x19
- text run at (287,0) width 8: "\x{A5}"
+ RenderText {#text} at (303,0) size 8x19
+ text run at (303,0) width 8: "\x{A5}"
RenderInline {SPAN} at (0,0) size 8x19
- RenderText {#text} at (295,0) size 8x19
- text run at (295,0) width 8: "\x{A5}"
+ RenderText {#text} at (311,0) size 8x19
+ text run at (311,0) width 8: "\x{A5}"
RenderBlock {DIV} at (0,190) size 765x19
- RenderInline {SPAN} at (0,0) size 291x19
- RenderText {#text} at (0,0) size 275x19
- text run at (0,0) width 275: "Using font \"\x{30E1}\x{30A4}\x{30EA}\x{30AA}\". expected: yen sign, actual: \x{A5}"
+ RenderInline {SPAN} at (0,0) size 307x19
+ RenderText {#text} at (0,0) size 291x19
+ text run at (0,0) width 291: "Using font \"\x{30E1}\x{30A4}\x{30EA}\x{30AA}\". expected: yen sign, actual: \x{A5}"
RenderInline {SPAN} at (0,0) size 8x19
- RenderText {#text} at (275,0) size 8x19
- text run at (275,0) width 8: "\x{A5}"
+ RenderText {#text} at (291,0) size 8x19
+ text run at (291,0) width 8: "\x{A5}"
RenderInline {SPAN} at (0,0) size 8x19
- RenderText {#text} at (283,0) size 8x19
- text run at (283,0) width 8: "\x{A5}"
+ RenderText {#text} at (299,0) size 8x19
+ text run at (299,0) width 8: "\x{A5}"
RenderInline {SPAN} at (0,0) size 8x19
- RenderText {#text} at (291,0) size 8x19
- text run at (291,0) width 8: "\x{A5}"
+ RenderText {#text} at (307,0) size 8x19
+ text run at (307,0) width 8: "\x{A5}"
RenderBlock {DIV} at (0,209) size 765x19
RenderInline {SPAN} at (0,0) size 302x19
RenderText {#text} at (0,0) size 294x19
diff --git a/LayoutTests/platform/gtk/fast/text/backslash-to-yen-sign-expected.txt b/LayoutTests/platform/gtk/fast/text/backslash-to-yen-sign-expected.txt
index f4d96f8..93392da 100644
--- a/LayoutTests/platform/gtk/fast/text/backslash-to-yen-sign-expected.txt
+++ b/LayoutTests/platform/gtk/fast/text/backslash-to-yen-sign-expected.txt
@@ -22,20 +22,20 @@ layer at (0,0) size 800x263
RenderText {#text} at (0,0) size 295x19
text run at (0,0) width 295: "Using font \"Meiryo\". expected: yen sign, actual: \x{A5}"
RenderBlock {DIV} at (0,114) size 784x19
- RenderText {#text} at (0,0) size 297x19
- text run at (0,0) width 297: "Using font \"\x{FF2D}\x{FF33} \x{FF30}\x{30B4}\x{30B7}\x{30C3}\x{30AF}\". expected: yen sign, actual: \x{A5}"
+ RenderText {#text} at (0,0) size 325x19
+ text run at (0,0) width 325: "Using font \"\x{FF2D}\x{FF33} \x{FF30}\x{30B4}\x{30B7}\x{30C3}\x{30AF}\". expected: yen sign, actual: \x{A5}"
RenderBlock {DIV} at (0,133) size 784x19
- RenderText {#text} at (0,0) size 291x19
- text run at (0,0) width 291: "Using font \"\x{FF2D}\x{FF33} \x{30B4}\x{30B7}\x{30C3}\x{30AF}\". expected: yen sign, actual: \x{A5}"
+ RenderText {#text} at (0,0) size 315x19
+ text run at (0,0) width 315: "Using font \"\x{FF2D}\x{FF33} \x{30B4}\x{30B7}\x{30C3}\x{30AF}\". expected: yen sign, actual: \x{A5}"
RenderBlock {DIV} at (0,152) size 784x19
- RenderText {#text} at (0,0) size 285x19
- text run at (0,0) width 285: "Using font \"\x{FF2D}\x{FF33} \x{FF30}\x{660E}\x{671D}\". expected: yen sign, actual: \x{A5}"
+ RenderText {#text} at (0,0) size 305x19
+ text run at (0,0) width 305: "Using font \"\x{FF2D}\x{FF33} \x{FF30}\x{660E}\x{671D}\". expected: yen sign, actual: \x{A5}"
RenderBlock {DIV} at (0,171) size 784x19
- RenderText {#text} at (0,0) size 279x19
- text run at (0,0) width 279: "Using font \"\x{FF2D}\x{FF33} \x{660E}\x{671D}\". expected: yen sign, actual: \x{A5}"
+ RenderText {#text} at (0,0) size 295x19
+ text run at (0,0) width 295: "Using font \"\x{FF2D}\x{FF33} \x{660E}\x{671D}\". expected: yen sign, actual: \x{A5}"
RenderBlock {DIV} at (0,190) size 784x19
- RenderText {#text} at (0,0) size 275x19
- text run at (0,0) width 275: "Using font \"\x{30E1}\x{30A4}\x{30EA}\x{30AA}\". expected: yen sign, actual: \x{A5}"
+ RenderText {#text} at (0,0) size 291x19
+ text run at (0,0) width 291: "Using font \"\x{30E1}\x{30A4}\x{30EA}\x{30AA}\". expected: yen sign, actual: \x{A5}"
RenderBlock {DIV} at (0,209) size 784x19
RenderText {#text} at (0,0) size 294x19
text run at (0,0) width 294: "Using font \"Times\". expected: backslash, actual: \\"
diff --git a/LayoutTests/platform/gtk/fast/text/international/plane2-expected.txt b/LayoutTests/platform/gtk/fast/text/international/plane2-expected.txt
index ef2016f..ea667d3 100644
--- a/LayoutTests/platform/gtk/fast/text/international/plane2-expected.txt
+++ b/LayoutTests/platform/gtk/fast/text/international/plane2-expected.txt
@@ -15,8 +15,8 @@ layer at (0,0) size 800x600
text run at (0,38) width 234: "fonts for Ext B shipped with Windows."
RenderBlock {DIV} at (0,73) size 784x74
RenderBlock {DIV} at (0,0) size 784x37
- RenderText {#text} at (0,0) size 76x36
- text run at (0,0) width 76: "\x{4E00} \x{3400} \x{D867}\x{DE8A}\x{D867}\x{DE49}\x{D867}\x{DEDB}"
+ RenderText {#text} at (0,0) size 111x36
+ text run at (0,0) width 111: "\x{4E00} \x{3400} \x{D867}\x{DE8A}\x{D867}\x{DE49}\x{D867}\x{DEDB}"
RenderBlock {DIV} at (0,37) size 784x37
- RenderText {#text} at (0,0) size 76x36
- text run at (0,0) width 76: "\x{4E00} \x{3400} \x{D867}\x{DE8A}\x{D867}\x{DE49}\x{D867}\x{DEDB}"
+ RenderText {#text} at (0,0) size 111x36
+ text run at (0,0) width 111: "\x{4E00} \x{3400} \x{D867}\x{DE8A}\x{D867}\x{DE49}\x{D867}\x{DEDB}"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list