[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
ossy at webkit.org
ossy at webkit.org
Thu Oct 29 20:47:37 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 6d7348bfc3aef2436af7d02b095dcb2ace36cd84
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 19 12:48:42 2009 +0000
2009-10-19 Andras Becsi <becsi.andras at stud.u-szeged.hu>
Reviewed by Tor Arne Vestbø.
[Qt] Update outdated metrics for these passing tests.
* platform/qt/css1/font_properties/font-expected.txt:
* platform/qt/fast/xsl/document-function-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49776 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 772d3d8..88dd22a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-19 Andras Becsi <becsi.andras at stud.u-szeged.hu>
+
+ Reviewed by Tor Arne Vestbø.
+
+ [Qt] Update outdated metrics for these passing tests.
+
+ * platform/qt/css1/font_properties/font-expected.txt:
+ * platform/qt/fast/xsl/document-function-expected.txt:
+
2009-10-18 Erik Arvidsson <arv at chromium.org>
Reviewed by Adam Barth.
diff --git a/LayoutTests/platform/qt/css1/font_properties/font-expected.txt b/LayoutTests/platform/qt/css1/font_properties/font-expected.txt
index 77b0ff7..0eb9b2a 100644
--- a/LayoutTests/platform/qt/css1/font_properties/font-expected.txt
+++ b/LayoutTests/platform/qt/css1/font_properties/font-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 800x4326
+layer at (0,0) size 800x4328
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x4326
- RenderBlock {HTML} at (0,0) size 800x4326
- RenderBody {BODY} at (8,8) size 784x4310 [bgcolor=#CCCCCC]
+layer at (0,0) size 800x4328
+ RenderBlock {HTML} at (0,0) size 800x4328
+ RenderBody {BODY} at (8,8) size 784x4312 [bgcolor=#CCCCCC]
RenderBlock {P} at (0,0) size 784x16
RenderText {#text} at (0,0) size 302x16
text run at (0,0) width 302: "The style declarations which apply to the text below are:"
@@ -107,10 +107,10 @@ layer at (0,0) size 800x4326
text run at (0,78) width 176: "element's font size). "
text run at (176,78) width 598: "Extra text is included for the purposes of testing this more effectively."
RenderBlock {P} at (0,1584) size 784x50
- RenderText {#text} at (0,6) size 781x38
+ RenderText {#text} at (0,6) size 778x38
text run at (0,6) width 301: "This element should be in a sans-serif font, with a weight of 400. "
- text run at (301,6) width 456: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px. "
- text run at (757,6) width 24: "Extra"
+ text run at (301,6) width 453: "Its font-size should be 80% of 12px, or 10px, and its line-height shoud be 2.5 times that, or 25px. "
+ text run at (754,6) width 24: "Extra"
text run at (0,31) width 291: "text is included for the purposes of testing this more effectively."
RenderBlock {P} at (0,1652) size 784x270
RenderInline {SPAN} at (0,0) size 761x240 [bgcolor=#C0C0C0]
@@ -122,18 +122,18 @@ layer at (0,0) size 800x4326
text run at (0,177) width 737: "has been set on an inline element and should therefore only cover the text, not the interline"
text run at (0,231) width 64: "spacing."
RenderText {#text} at (0,0) size 0x0
- RenderTable {TABLE} at (0,1940) size 784x2370 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 782x2368
+ RenderTable {TABLE} at (0,1940) size 784x2372 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 782x2370
RenderTableRow {TR} at (0,0) size 782x30
RenderTableCell {TD} at (0,0) size 782x30 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
RenderInline {STRONG} at (0,0) size 178x21
RenderText {#text} at (4,4) size 178x21
text run at (4,4) width 178: "TABLE Testing Section"
- RenderTableRow {TR} at (0,30) size 782x2338
- RenderTableCell {TD} at (0,1184) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,30) size 782x2340
+ RenderTableCell {TD} at (0,1185) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
RenderText {#text} at (4,4) size 4x21
text run at (4,4) width 4: " "
- RenderTableCell {TD} at (12,30) size 770x2338 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (12,30) size 770x2340 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderBlock {P} at (4,4) size 762x42
RenderText {#text} at (0,0) size 738x42
text run at (0,0) width 620: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. "
@@ -211,13 +211,13 @@ layer at (0,0) size 800x4326
text run at (0,78) width 176: "element's font size). "
text run at (176,78) width 500: "Extra text is included for the purposes of testing this more"
text run at (0,114) width 93: "effectively."
- RenderBlock {P} at (4,1814) size 762x64
- RenderText {#text} at (0,7) size 749x49
- text run at (0,7) width 378: "This element should be in a sans-serif font, with a weight of 400. "
- text run at (378,7) width 371: "Its font-size should be 80% of 12px, or 9.6px, and its line-height"
- text run at (0,39) width 196: "shoud be 2.5 times that, or 24px. "
- text run at (196,39) width 405: "Extra text is included for the purposes of testing this more effectively."
- RenderBlock {P} at (4,1902) size 762x432
+ RenderBlock {P} at (4,1814) size 762x66
+ RenderText {#text} at (0,8) size 745x50
+ text run at (0,8) width 378: "This element should be in a sans-serif font, with a weight of 400. "
+ text run at (378,8) width 367: "Its font-size should be 80% of 12px, or 10px, and its line-height"
+ text run at (0,41) width 196: "shoud be 2.5 times that, or 25px. "
+ text run at (196,41) width 405: "Extra text is included for the purposes of testing this more effectively."
+ RenderBlock {P} at (4,1904) size 762x432
RenderInline {SPAN} at (0,0) size 762x391 [bgcolor=#C0C0C0]
RenderText {#text} at (0,20) size 762x391
text run at (0,20) width 752: "This element should be in a sans-serif font, italicized and small caps, with"
diff --git a/LayoutTests/platform/qt/fast/xsl/document-function-expected.txt b/LayoutTests/platform/qt/fast/xsl/document-function-expected.txt
index e2a1950..03d239b 100644
--- a/LayoutTests/platform/qt/fast/xsl/document-function-expected.txt
+++ b/LayoutTests/platform/qt/fast/xsl/document-function-expected.txt
@@ -2,16 +2,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 784x579
- RenderBlock {P} at (0,0) size 784x17
- RenderText {#text} at (0,0) size 603x17
- text run at (0,0) width 603: "This tests the xslt document() function. If this test is successful, there should be three paragraphs below."
- RenderBlock {P} at (0,30) size 784x17
- RenderText {#text} at (0,0) size 109x17
- text run at (0,0) width 109: "This is a paragraph"
- RenderBlock {P} at (0,60) size 784x17
- RenderText {#text} at (0,0) size 146x17
- text run at (0,0) width 146: "This is another paragraph"
- RenderBlock {P} at (0,90) size 784x17
- RenderText {#text} at (0,0) size 141x17
- text run at (0,0) width 141: "This is a third paragraph."
+ RenderBody {BODY} at (8,8) size 784x576
+ RenderBlock {P} at (0,0) size 784x21
+ RenderText {#text} at (0,0) size 729x21
+ text run at (0,0) width 729: "This tests the xslt document() function. If this test is successful, there should be three paragraphs below."
+ RenderBlock {P} at (0,37) size 784x21
+ RenderText {#text} at (0,0) size 137x21
+ text run at (0,0) width 137: "This is a paragraph"
+ RenderBlock {P} at (0,74) size 784x21
+ RenderText {#text} at (0,0) size 182x21
+ text run at (0,0) width 182: "This is another paragraph"
+ RenderBlock {P} at (0,111) size 784x21
+ RenderText {#text} at (0,0) size 176x21
+ text run at (0,0) width 176: "This is a third paragraph."
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list