[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 16:03:30 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f0cd72bedb8538a3b54f702f9c97eda96d0eb310
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 18 06:36:33 2010 +0000
2010-11-17 Martin Robinson <mrobinson at igalia.com>
Fix two incorrect GTK+ baselines.
* platform/gtk/fast/css/line-height-determined-by-primary-font-expected.txt:
* platform/gtk/fast/css/negative-leading-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72276 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b2839a0..55d44b1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-17 Martin Robinson <mrobinson at igalia.com>
+
+ Fix two incorrect GTK+ baselines.
+
+ * platform/gtk/fast/css/line-height-determined-by-primary-font-expected.txt:
+ * platform/gtk/fast/css/negative-leading-expected.txt:
+
2010-11-17 David Levin <levin at chromium.org>
Add some test_expectations for failing tests
diff --git a/LayoutTests/platform/gtk/fast/css/line-height-determined-by-primary-font-expected.txt b/LayoutTests/platform/gtk/fast/css/line-height-determined-by-primary-font-expected.txt
index c5a8df9..ee5fe6e 100644
--- a/LayoutTests/platform/gtk/fast/css/line-height-determined-by-primary-font-expected.txt
+++ b/LayoutTests/platform/gtk/fast/css/line-height-determined-by-primary-font-expected.txt
@@ -1,8 +1,62 @@
-
-<html>
- <head><title>404 - No Such Resource</title></head>
- <body>
- <h1>No Such Resource</h1>
- <p>File not found.</p>
- </body>
-</html>
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x270
+ RenderBlock {HTML} at (0,0) size 800x270
+ RenderBody {BODY} at (8,12) size 784x246
+ RenderBlock {P} at (0,0) size 784x28
+ RenderText {#text} at (0,0) size 779x28
+ text run at (0,0) width 779: "This test verifies that line height is determined solely by a box's primary font, not by its fallback fonts. The following two lines should have a solid, unbroken red line"
+ text run at (0,14) width 58: "below them:"
+ RenderBlock {DIV} at (0,40) size 784x97
+ RenderBlock {UL} at (0,0) size 567x97
+ RenderBlock (floating) {LI} at (40,0) size 46x31 [border: (1px solid #FF0000) none]
+ RenderInline {A} at (0,0) size 24x17
+ RenderText {#text} at (12,6) size 24x17
+ text run at (12,6) width 24: "\x{6EE8}\x{5D0E}\x{6B65}"
+ RenderBlock (floating) {LI} at (86,0) size 55x31 [border: (1px solid #FF0000) none]
+ RenderInline {A} at (0,0) size 33x21
+ RenderText {#text} at (12,4) size 33x21
+ text run at (12,4) width 33: "\x{8521}\x{4F9D}\x{6797}"
+ RenderBlock (floating) {LI} at (141,0) size 64x31 [border: (1px solid #FF0000) none]
+ RenderInline {A} at (0,0) size 42x28
+ RenderText {#text} at (12,1) size 42x28
+ text run at (12,1) width 42: "\x{9648}\x{7EEE}\x{8D1E}"
+ RenderBlock (floating) {LI} at (205,0) size 55x31 [border: (1px solid #FF0000) none]
+ RenderInline {A} at (0,0) size 33x21
+ RenderText {#text} at (12,4) size 33x21
+ text run at (12,4) width 33: "\x{9648}\x{5955}\x{8FC5}"
+ RenderBlock (floating) {LI} at (260,0) size 43x31 [border: (1px solid #FF0000) none]
+ RenderInline {A} at (0,0) size 21x14
+ RenderText {#text} at (12,8) size 21x14
+ text run at (12,8) width 21: "\x{9ED1}\x{9E2D}\x{5B50}"
+ RenderBlock (floating) {LI} at (303,0) size 46x31 [border: (1px solid #FF0000) none]
+ RenderInline {A} at (0,0) size 24x17
+ RenderText {#text} at (12,6) size 24x17
+ text run at (12,6) width 24: "\x{674E}\x{5B87}\x{6625}"
+ RenderBlock (floating) {LI} at (349,0) size 46x31 [border: (1px solid #FF0000) none]
+ RenderInline {A} at (0,0) size 24x17
+ RenderText {#text} at (12,6) size 24x17
+ text run at (12,6) width 24: "\x{6881}\x{9759}\x{8339}"
+ RenderBlock {DIV} at (0,149) size 784x97
+ RenderBlock {UL} at (0,0) size 567x97
+ RenderBlock (floating) {LI} at (40,0) size 46x31 [border: (1px solid #FF0000) none]
+ RenderText {#text} at (12,6) size 24x17
+ text run at (12,6) width 24: "\x{6EE8}\x{5D0E}\x{6B65}"
+ RenderBlock (floating) {LI} at (86,0) size 55x31 [border: (1px solid #FF0000) none]
+ RenderText {#text} at (12,4) size 33x21
+ text run at (12,4) width 33: "\x{8521}\x{4F9D}\x{6797}"
+ RenderBlock (floating) {LI} at (141,0) size 64x31 [border: (1px solid #FF0000) none]
+ RenderText {#text} at (12,1) size 42x28
+ text run at (12,1) width 42: "\x{9648}\x{7EEE}\x{8D1E}"
+ RenderBlock (floating) {LI} at (205,0) size 55x31 [border: (1px solid #FF0000) none]
+ RenderText {#text} at (12,4) size 33x21
+ text run at (12,4) width 33: "\x{9648}\x{5955}\x{8FC5}"
+ RenderBlock (floating) {LI} at (260,0) size 43x31 [border: (1px solid #FF0000) none]
+ RenderText {#text} at (12,8) size 21x14
+ text run at (12,8) width 21: "\x{9ED1}\x{9E2D}\x{5B50}"
+ RenderBlock (floating) {LI} at (303,0) size 46x31 [border: (1px solid #FF0000) none]
+ RenderText {#text} at (12,6) size 24x17
+ text run at (12,6) width 24: "\x{674E}\x{5B87}\x{6625}"
+ RenderBlock (floating) {LI} at (349,0) size 46x31 [border: (1px solid #FF0000) none]
+ RenderText {#text} at (12,6) size 24x17
+ text run at (12,6) width 24: "\x{6881}\x{9759}\x{8339}"
diff --git a/LayoutTests/platform/gtk/fast/css/negative-leading-expected.txt b/LayoutTests/platform/gtk/fast/css/negative-leading-expected.txt
index c5a8df9..e7b2cb8 100644
--- a/LayoutTests/platform/gtk/fast/css/negative-leading-expected.txt
+++ b/LayoutTests/platform/gtk/fast/css/negative-leading-expected.txt
@@ -1,8 +1,21 @@
-
-<html>
- <head><title>404 - No Such Resource</title></head>
- <body>
- <h1>No Such Resource</h1>
- <p>File not found.</p>
- </body>
-</html>
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x209
+ RenderBlock {HTML} at (0,0) size 800x201
+ RenderBody {BODY} at (8,16) size 784x177
+ RenderBlock {P} at (0,0) size 784x38
+ RenderText {#text} at (0,0) size 751x38
+ text run at (0,0) width 751: "The following two phrases should appear identical. The second line of text should overlap both the first line and the red"
+ text run at (0,19) width 45: "border."
+ RenderBlock {DIV} at (0,54) size 424x52 [border: (2px solid #FF0000)]
+ RenderBlock {DIV} at (12,12) size 400x38
+ RenderText {#text} at (0,-18) size 400x74
+ text run at (0,-18) width 400: "Lorem ipsum dolor"
+ text run at (0,1) width 168: "sit amet"
+ RenderBlock (anonymous) at (0,106) size 784x19
+ RenderBR {BR} at (0,0) size 0x19
+ RenderBlock {DIV} at (0,125) size 424x52 [border: (2px solid #FF0000)]
+ RenderBlock {DIV} at (12,12) size 400x38
+ RenderText {#text} at (0,-18) size 400x74
+ text run at (0,-18) width 400: "Lorem ipsum dolor"
+ text run at (0,1) width 168: "sit amet"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list