[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 00:18:54 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit c0f419715388a42b7684296a0f320879793f308a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 4 17:57:47 2009 +0000
2009-12-04 Benjamin Poulain <benjamin.poulain at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] WebKit crashes when loading certain SVG images
https://bugs.webkit.org/show_bug.cgi?id=29443
Update the test results for the new FontCache implementation.
* platform/qt/css1/box_properties/float_elements_in_series-expected.txt:
* platform/qt/css1/font_properties/font_variant-expected.txt:
* platform/qt/css1/pseudo/firstline-expected.txt:
* platform/qt/css1/pseudo/multiple_pseudo_elements-expected.txt:
* platform/qt/css2.1/t1505-c524-font-var-00-b-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51700 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3edcda7..7842255 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2009-12-04 Benjamin Poulain <benjamin.poulain at nokia.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] WebKit crashes when loading certain SVG images
+ https://bugs.webkit.org/show_bug.cgi?id=29443
+
+ Update the test results for the new FontCache implementation.
+
+ * platform/qt/css1/box_properties/float_elements_in_series-expected.txt:
+ * platform/qt/css1/font_properties/font_variant-expected.txt:
+ * platform/qt/css1/pseudo/firstline-expected.txt:
+ * platform/qt/css1/pseudo/multiple_pseudo_elements-expected.txt:
+ * platform/qt/css2.1/t1505-c524-font-var-00-b-expected.txt:
+
2009-12-04 Steve Block <steveblock at google.com>
Reviewed by Darin Adler.
diff --git a/LayoutTests/platform/qt/css1/box_properties/float_elements_in_series-expected.txt b/LayoutTests/platform/qt/css1/box_properties/float_elements_in_series-expected.txt
index c760441..3393d1d 100644
--- a/LayoutTests/platform/qt/css1/box_properties/float_elements_in_series-expected.txt
+++ b/LayoutTests/platform/qt/css1/box_properties/float_elements_in_series-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 784x775
+layer at (0,0) size 784x773
RenderView at (0,0) size 784x600
-layer at (0,0) size 784x775
- RenderBlock {HTML} at (0,0) size 784x775
- RenderBody {BODY} at (8,8) size 768x747 [bgcolor=#CCCCCC]
+layer at (0,0) size 784x773
+ RenderBlock {HTML} at (0,0) size 784x773
+ RenderBody {BODY} at (8,8) size 768x745 [bgcolor=#CCCCCC]
RenderBlock {P} at (0,0) size 768x20
RenderText {#text} at (0,0) size 395x20
text run at (0,0) width 395: "The style declarations which apply to the text below are:"
@@ -39,23 +39,23 @@ layer at (0,0) size 784x775
text run at (0,20) width 560: "of this page indicates how the DIV elements should be laid out horizontally. "
text run at (560,20) width 208: "They should align with each"
text run at (0,40) width 40: "other."
- RenderBlock (floating) {DIV} at (0,334) size 140x101 [bgcolor=#FFFF00] [border: (20px solid #000000)]
- RenderBlock {P} at (40,40) size 60x21
- RenderText {#text} at (0,0) size 47x21
- text run at (0,0) width 47: "Yellow"
- RenderBlock (floating) {DIV} at (160,334) size 140x101 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)]
- RenderBlock {P} at (40,40) size 60x21
- RenderText {#text} at (0,0) size 31x21
- text run at (0,0) width 31: "Blue"
- RenderBlock (floating) {DIV} at (320,334) size 140x101 [bgcolor=#FF0000] [border: (20px solid #000000)]
- RenderBlock {P} at (40,40) size 60x21
- RenderText {#text} at (0,0) size 28x21
- text run at (0,0) width 28: "Red"
- RenderBlock (floating) {DIV} at (480,334) size 140x101 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)]
- RenderBlock {P} at (40,40) size 60x21
- RenderText {#text} at (0,0) size 42x21
- text run at (0,0) width 42: "Green"
- RenderBlock {DIV} at (0,445) size 768x21
+ RenderBlock (floating) {DIV} at (0,334) size 140x100 [bgcolor=#FFFF00] [border: (20px solid #000000)]
+ RenderBlock {P} at (40,40) size 60x20
+ RenderText {#text} at (0,0) size 49x20
+ text run at (0,0) width 49: "Yellow"
+ RenderBlock (floating) {DIV} at (160,334) size 140x100 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)]
+ RenderBlock {P} at (40,40) size 60x20
+ RenderText {#text} at (0,0) size 33x20
+ text run at (0,0) width 33: "Blue"
+ RenderBlock (floating) {DIV} at (320,334) size 140x100 [bgcolor=#FF0000] [border: (20px solid #000000)]
+ RenderBlock {P} at (40,40) size 60x20
+ RenderText {#text} at (0,0) size 30x20
+ text run at (0,0) width 30: "Red"
+ RenderBlock (floating) {DIV} at (480,334) size 140x100 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)]
+ RenderBlock {P} at (40,40) size 60x20
+ RenderText {#text} at (0,0) size 44x20
+ text run at (0,0) width 44: "Green"
+ RenderBlock {DIV} at (0,444) size 768x21
RenderTable {TABLE} at (0,0) size 620x21
RenderTableSection {TBODY} at (0,0) size 620x21
RenderTableRow {TR} at (0,0) size 620x21
@@ -91,41 +91,41 @@ layer at (0,0) size 784x775
RenderImage {IMG} at (0,0) size 100x1
RenderTableCell {TD} at (600,10) size 20x1 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1]
RenderImage {IMG} at (0,0) size 20x1
- RenderTable {TABLE} at (0,486) size 768x261 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 766x259
+ RenderTable {TABLE} at (0,485) size 768x260 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 766x258
RenderTableRow {TR} at (0,0) size 766x29
RenderTableCell {TD} at (0,0) size 766x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
RenderInline {STRONG} at (0,0) size 178x20
RenderText {#text} at (4,4) size 178x20
text run at (4,4) width 178: "TABLE Testing Section"
- RenderTableRow {TR} at (0,29) size 766x230
- RenderTableCell {TD} at (0,130) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,29) size 766x229
+ RenderTableCell {TD} at (0,129) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
RenderText {#text} at (4,4) size 4x20
text run at (4,4) width 4: " "
- RenderTableCell {TD} at (12,29) size 754x230 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (12,29) size 754x229 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderBlock {P} at (4,4) size 746x60
RenderText {#text} at (0,0) size 746x60
text run at (0,0) width 746: "The four floating DIV elements below should appear next to each other horizontally. The table at the"
text run at (0,20) width 586: "bottom of this page indicates how the DIV elements should be laid out horizontally. "
text run at (586,20) width 160: "They should align with"
text run at (0,40) width 79: "each other."
- RenderBlock (floating) {DIV} at (4,74) size 140x101 [bgcolor=#FFFF00] [border: (20px solid #000000)]
- RenderBlock {P} at (40,40) size 60x21
- RenderText {#text} at (0,0) size 47x21
- text run at (0,0) width 47: "Yellow"
- RenderBlock (floating) {DIV} at (164,74) size 140x101 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)]
- RenderBlock {P} at (40,40) size 60x21
- RenderText {#text} at (0,0) size 31x21
- text run at (0,0) width 31: "Blue"
- RenderBlock (floating) {DIV} at (324,74) size 140x101 [bgcolor=#FF0000] [border: (20px solid #000000)]
- RenderBlock {P} at (40,40) size 60x21
- RenderText {#text} at (0,0) size 28x21
- text run at (0,0) width 28: "Red"
- RenderBlock (floating) {DIV} at (484,74) size 140x101 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)]
- RenderBlock {P} at (40,40) size 60x21
- RenderText {#text} at (0,0) size 42x21
- text run at (0,0) width 42: "Green"
- RenderBlock {DIV} at (4,185) size 746x21
+ RenderBlock (floating) {DIV} at (4,74) size 140x100 [bgcolor=#FFFF00] [border: (20px solid #000000)]
+ RenderBlock {P} at (40,40) size 60x20
+ RenderText {#text} at (0,0) size 49x20
+ text run at (0,0) width 49: "Yellow"
+ RenderBlock (floating) {DIV} at (164,74) size 140x100 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)]
+ RenderBlock {P} at (40,40) size 60x20
+ RenderText {#text} at (0,0) size 33x20
+ text run at (0,0) width 33: "Blue"
+ RenderBlock (floating) {DIV} at (324,74) size 140x100 [bgcolor=#FF0000] [border: (20px solid #000000)]
+ RenderBlock {P} at (40,40) size 60x20
+ RenderText {#text} at (0,0) size 30x20
+ text run at (0,0) width 30: "Red"
+ RenderBlock (floating) {DIV} at (484,74) size 140x100 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)]
+ RenderBlock {P} at (40,40) size 60x20
+ RenderText {#text} at (0,0) size 44x20
+ text run at (0,0) width 44: "Green"
+ RenderBlock {DIV} at (4,184) size 746x21
RenderTable {TABLE} at (0,0) size 620x21
RenderTableSection {TBODY} at (0,0) size 620x21
RenderTableRow {TR} at (0,0) size 620x21
diff --git a/LayoutTests/platform/qt/css1/font_properties/font_variant-expected.txt b/LayoutTests/platform/qt/css1/font_properties/font_variant-expected.txt
index a60735f..63b50da 100644
--- a/LayoutTests/platform/qt/css1/font_properties/font_variant-expected.txt
+++ b/LayoutTests/platform/qt/css1/font_properties/font_variant-expected.txt
@@ -15,36 +15,36 @@ layer at (0,0) size 800x600
text run at (0,32) width 0: " "
RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,115) size 784x20
- RenderText {#text} at (0,0) size 271x20
- text run at (0,0) width 271: "This Paragraph should be in Small Caps."
+ RenderText {#text} at (0,0) size 292x20
+ text run at (0,0) width 292: "This Paragraph should be in Small Caps."
RenderBlock {P} at (0,151) size 784x20
- RenderText {#text} at (0,0) size 581x20
- text run at (0,0) width 581: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be "
+ RenderText {#text} at (0,0) size 613x20
+ text run at (0,0) width 613: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be "
RenderInline {SPAN} at (0,0) size 52x20
- RenderText {#text} at (581,0) size 52x20
- text run at (581,0) width 52: "Normal"
- RenderText {#text} at (633,0) size 4x20
- text run at (633,0) width 4: "."
- RenderTable {TABLE} at (0,187) size 659x95 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 657x93
- RenderTableRow {TR} at (0,0) size 657x29
- RenderTableCell {TD} at (0,0) size 657x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
+ RenderText {#text} at (613,0) size 52x20
+ text run at (613,0) width 52: "Normal"
+ RenderText {#text} at (665,0) size 4x20
+ text run at (665,0) width 4: "."
+ RenderTable {TABLE} at (0,187) size 691x95 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 689x93
+ RenderTableRow {TR} at (0,0) size 689x29
+ RenderTableCell {TD} at (0,0) size 689x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
RenderInline {STRONG} at (0,0) size 178x20
RenderText {#text} at (4,4) size 178x20
text run at (4,4) width 178: "TABLE Testing Section"
- RenderTableRow {TR} at (0,29) size 657x64
+ RenderTableRow {TR} at (0,29) size 689x64
RenderTableCell {TD} at (0,47) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
RenderText {#text} at (4,4) size 4x20
text run at (4,4) width 4: " "
- RenderTableCell {TD} at (12,29) size 645x64 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
- RenderBlock {P} at (4,4) size 637x20
- RenderText {#text} at (0,0) size 271x20
- text run at (0,0) width 271: "This Paragraph should be in Small Caps."
- RenderBlock {P} at (4,40) size 637x20
- RenderText {#text} at (0,0) size 581x20
- text run at (0,0) width 581: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be "
+ RenderTableCell {TD} at (12,29) size 677x64 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+ RenderBlock {P} at (4,4) size 669x20
+ RenderText {#text} at (0,0) size 292x20
+ text run at (0,0) width 292: "This Paragraph should be in Small Caps."
+ RenderBlock {P} at (4,40) size 669x20
+ RenderText {#text} at (0,0) size 613x20
+ text run at (0,0) width 613: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be "
RenderInline {SPAN} at (0,0) size 52x20
- RenderText {#text} at (581,0) size 52x20
- text run at (581,0) width 52: "Normal"
- RenderText {#text} at (633,0) size 4x20
- text run at (633,0) width 4: "."
+ RenderText {#text} at (613,0) size 52x20
+ text run at (613,0) width 52: "Normal"
+ RenderText {#text} at (665,0) size 4x20
+ text run at (665,0) width 4: "."
diff --git a/LayoutTests/platform/qt/css1/pseudo/firstline-expected.txt b/LayoutTests/platform/qt/css1/pseudo/firstline-expected.txt
index b95b7de..e7754a2 100644
--- a/LayoutTests/platform/qt/css1/pseudo/firstline-expected.txt
+++ b/LayoutTests/platform/qt/css1/pseudo/firstline-expected.txt
@@ -32,18 +32,18 @@ layer at (0,0) size 784x746
text run at (135,60) width 610: "Remember that in order to ensure a complete test, the paragraph must be displayed on"
text run at (0,80) width 136: "more than one line."
RenderBlock {P} at (0,323) size 768x80
- RenderText {#text} at (0,0) size 761x60
- text run at (0,0) width 606: "The first line of this paragraph, and only that one, should be displayed in small-caps style. "
- text run at (606,0) width 155: "Thus, if the first line is"
- text run at (0,20) width 757: "not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this"
- text run at (0,40) width 283: "test (although the problem might be that "
+ RenderText {#text} at (0,0) size 741x60
+ text run at (0,0) width 634: "The first line of this paragraph, and only that one, should be displayed in small-caps style. "
+ text run at (634,0) width 107: "Thus, if the first"
+ text run at (0,20) width 731: "line is not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has"
+ text run at (0,40) width 355: "failed this test (although the problem might be that "
RenderInline {CODE} at (0,0) size 63x16
- RenderText {#text} at (283,43) size 63x16
- text run at (283,43) width 63: "small-caps"
- RenderText {#text} at (346,40) size 708x40
- text run at (346,40) width 247: " is not supported by your browser). "
- text run at (593,40) width 115: "This is extra text"
- text run at (0,60) width 644: "included for the purposes of making the paragraph long enough to have more than one line."
+ RenderText {#text} at (355,43) size 63x16
+ text run at (355,43) width 63: "small-caps"
+ RenderText {#text} at (418,40) size 751x40
+ text run at (418,40) width 247: " is not supported by your browser). "
+ text run at (665,40) width 86: "This is extra"
+ text run at (0,60) width 673: "text included for the purposes of making the paragraph long enough to have more than one line."
RenderTable {TABLE} at (0,419) size 768x311 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 766x309
RenderTableRow {TR} at (0,0) size 766x29
@@ -72,9 +72,9 @@ layer at (0,0) size 784x746
text run at (179,60) width 515: "Remember that in order to ensure a complete test, the paragraph must be"
text run at (0,80) width 231: "displayed on more than one line."
RenderBlock {P} at (4,196) size 746x80
- RenderText {#text} at (0,0) size 731x60
- text run at (0,0) width 606: "The first line of this paragraph, and only that one, should be displayed in small-caps style. "
- text run at (606,0) width 113: "Thus, if the first"
+ RenderText {#text} at (0,0) size 741x60
+ text run at (0,0) width 634: "The first line of this paragraph, and only that one, should be displayed in small-caps style. "
+ text run at (634,0) width 107: "Thus, if the first"
text run at (0,20) width 731: "line is not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has"
text run at (0,40) width 355: "failed this test (although the problem might be that "
RenderInline {CODE} at (0,0) size 63x16
diff --git a/LayoutTests/platform/qt/css1/pseudo/multiple_pseudo_elements-expected.txt b/LayoutTests/platform/qt/css1/pseudo/multiple_pseudo_elements-expected.txt
index c3b216d..f424597 100644
--- a/LayoutTests/platform/qt/css1/pseudo/multiple_pseudo_elements-expected.txt
+++ b/LayoutTests/platform/qt/css1/pseudo/multiple_pseudo_elements-expected.txt
@@ -51,8 +51,8 @@ layer at (0,0) size 784x1170
RenderText {#text} at (0,0) size 73x69
text run at (0,0) width 73: "\"W"
RenderText {#text} at (73,38) size 762x91
- text run at (73,38) width 344: "e should check for quotation support,\" it was said. "
- text run at (417,38) width 308: "The first two characters in this paragraph-- a"
+ text run at (73,38) width 353: "e should check for quotation support,\" it was said. "
+ text run at (426,38) width 310: "The first two characters in this paragraph-- a"
text run at (0,69) width 735: "double-quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon"
text run at (0,89) width 76: "(dark red). "
text run at (76,89) width 681: "Note that the inclusion of both the quotation mark and the 'W' in the first-letter style is not required"
@@ -97,8 +97,8 @@ layer at (0,0) size 784x1170
RenderText {#text} at (0,0) size 73x69
text run at (0,0) width 73: "\"W"
RenderText {#text} at (73,38) size 745x111
- text run at (73,38) width 344: "e should check for quotation support,\" it was said. "
- text run at (417,38) width 308: "The first two characters in this paragraph-- a"
+ text run at (73,38) width 353: "e should check for quotation support,\" it was said. "
+ text run at (426,38) width 310: "The first two characters in this paragraph-- a"
text run at (0,69) width 735: "double-quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon"
text run at (0,89) width 76: "(dark red). "
text run at (76,89) width 618: "Note that the inclusion of both the quotation mark and the 'W' in the first-letter style is not"
diff --git a/LayoutTests/platform/qt/css2.1/t1505-c524-font-var-00-b-expected.txt b/LayoutTests/platform/qt/css2.1/t1505-c524-font-var-00-b-expected.txt
index 0bd0282..6e0c25e 100644
--- a/LayoutTests/platform/qt/css2.1/t1505-c524-font-var-00-b-expected.txt
+++ b/LayoutTests/platform/qt/css2.1/t1505-c524-font-var-00-b-expected.txt
@@ -4,12 +4,12 @@ layer at (0,0) size 800x88
RenderBlock {HTML} at (0,0) size 800x88
RenderBody {BODY} at (8,16) size 784x56
RenderBlock {P} at (0,0) size 784x20 [color=#000080]
- RenderText {#text} at (0,0) size 271x20
- text run at (0,0) width 271: "This Paragraph should be in Small Caps."
+ RenderText {#text} at (0,0) size 292x20
+ text run at (0,0) width 292: "This Paragraph should be in Small Caps."
RenderBlock {P} at (0,36) size 784x20 [color=#000080]
- RenderText {#text} at (0,0) size 266x20
- text run at (0,0) width 266: "This Sentence should be in Small Caps. "
+ RenderText {#text} at (0,0) size 289x20
+ text run at (0,0) width 289: "This Sentence should be in Small Caps. "
RenderInline {SPAN} at (0,0) size 237x20
- RenderText {#text} at (266,0) size 237x20
- text run at (266,0) width 237: "This Sentence should be Normal."
+ RenderText {#text} at (289,0) size 237x20
+ text run at (289,0) width 237: "This Sentence should be Normal."
RenderText {#text} at (0,0) size 0x0
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list