[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
hausmann at webkit.org
hausmann at webkit.org
Wed Dec 22 13:21:26 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9f1a95d82de62abce69d832168e2f4797fe5cf03
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Sep 12 19:08:43 2010 +0000
[Qt] Rebase a bunch of tests after r67200.
Reviewed by Antonio Gomes.
* platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt:
* platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt:
* platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.txt:
* platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67341 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fef22eb..ae80b68 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-12 Simon Hausmann <simon.hausmann at nokia.com>
+
+ Reviewed by Antonio Gomes.
+
+ [Qt] Rebase a bunch of tests after r67200.
+
+ * platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt:
+ * platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt:
+ * platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.txt:
+ * platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.txt:
+
2010-09-12 Andreas Kling <andreas.kling at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
index 1f5e739..e5da88a 100644
--- a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
+++ b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
@@ -1,15 +1,15 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x491
- RenderBlock {html} at (0,0) size 800x491
- RenderBody {body} at (8,23) size 784x460
- RenderBlock {p} at (0,0) size 784x30 [color=#000080]
- RenderText {#text} at (0,0) size 633x30
- text run at (0,0) width 633: "There should be a blue circle with the word \"TEST\" in it below."
- RenderBlock (anonymous) at (0,53) size 784x407
- RenderSVGRoot {svg} at (8,76) size 400x400
- RenderPath {rect} at (8,76) size 400x400 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00 L400.00,0.00 L400.00,400.00 L0.00,400.00 L0.00,0.00"]
- RenderPath {circle} at (8,76) size 400x400 [fill={[type=SOLID] [color=#000080]}] [data="M400.00,200.00 L399.61,212.56 L398.42,225.07 L396.46,237.48 L393.72,249.74 L390.21,261.80 L385.96,273.62 L380.97,285.16 L375.26,296.35 L368.87,307.17 L361.80,317.56 L354.10,327.48 L345.79,336.91 L336.91,345.79 L327.48,354.10 L317.56,361.80 L307.17,368.87 L296.35,375.26 L285.16,380.97 L273.62,385.96 L261.80,390.21 L249.74,393.72 L237.48,396.46 L225.07,398.42 L212.56,399.61 L200.00,400.00 L187.44,399.61 L174.93,398.42 L162.52,396.46 L150.26,393.72 L138.20,390.21 L126.38,385.96 L114.84,380.97 L103.65,375.26 L92.83,368.87 L82.44,361.80 L72.52,354.10 L63.09,345.79 L54.21,336.91 L45.90,327.48 L38.20,317.56 L31.13,307.17 L24.74,296.35 L19.03,285.16 L14.04,273.62 L9.79,261.80 L6.28,249.74 L3.54,237.48 L1.58,225.07 L0.39,212.56 L0.00,200.00 L0.39,187.44 L1.58,174.93 L3.54,162.52 L6.28,150.26 L9.79,138.20 L14.04,126.38 L19.03,114.84 L24.74,103.65 L31.13,92.83 L38.20,82.44 L45.90,72.52 L54.21,63.09 L63.09,54.21 L72.52,45.90 L82.44,38.20 L92.83,31.13 L103.65,24.74 L114.84,19.03 L126.38,14.04 L138.20,9.79 L150.26,6.28 L162.52,3.54 L174.93,1.58 L187.44,0.39 L200.00,0.00 L212.56,0.39 L225.07,1.58 L237.48,3.54 L249.74,6.28 L261.80,9.79 L273.62,14.04 L285.16,19.03 L296.35,24.74 L307.17,31.13 L317.56,38.20 L327.48,45.90 L336.91,54.21 L345.79,63.09 L354.10,72.52 L361.80,82.44 L368.87,92.83 L375.26,103.65 L380.97,114.84 L385.96,126.38 L390.21,138.20 L393.72,150.26 L396.46,162.52 L398.42,174.93 L399.61,187.44 L400.00,200.00"]
+layer at (0,0) size 800x477
+ RenderBlock {html} at (0,0) size 800x477
+ RenderBody {body} at (8,19) size 784x450
+ RenderBlock {p} at (0,0) size 784x25 [color=#000080]
+ RenderText {#text} at (0,0) size 525x25
+ text run at (0,0) width 525: "There should be a blue circle with the word \"TEST\" in it below."
+ RenderBlock (anonymous) at (0,44) size 784x406
+ RenderSVGRoot {svg} at (8,63) size 400x400
+ RenderPath {rect} at (8,63) size 400x400 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00 L400.00,0.00 L400.00,400.00 L0.00,400.00 L0.00,0.00"]
+ RenderPath {circle} at (8,63) size 400x400 [fill={[type=SOLID] [color=#000080]}] [data="M400.00,200.00 L399.61,212.56 L398.42,225.07 L396.46,237.48 L393.72,249.74 L390.21,261.80 L385.96,273.62 L380.97,285.16 L375.26,296.35 L368.87,307.17 L361.80,317.56 L354.10,327.48 L345.79,336.91 L336.91,345.79 L327.48,354.10 L317.56,361.80 L307.17,368.87 L296.35,375.26 L285.16,380.97 L273.62,385.96 L261.80,390.21 L249.74,393.72 L237.48,396.46 L225.07,398.42 L212.56,399.61 L200.00,400.00 L187.44,399.61 L174.93,398.42 L162.52,396.46 L150.26,393.72 L138.20,390.21 L126.38,385.96 L114.84,380.97 L103.65,375.26 L92.83,368.87 L82.44,361.80 L72.52,354.10 L63.09,345.79 L54.21,336.91 L45.90,327.48 L38.20,317.56 L31.13,307.17 L24.74,296.35 L19.03,285.16 L14.04,273.62 L9.79,261.80 L6.28,249.74 L3.54,237.48 L1.58,225.07 L0.39,212.56 L0.00,200.00 L0.39,187.44 L1.58,174.93 L3.54,162.52 L6.28,150.26 L9.79,138.20 L14.04,126.38 L19.03,114.84 L24.74,103.65 L31.13,92.83 L38.20,82.44 L45.90,72.52 L54.21,63.09 L63.09,54.21 L72.52,45.90 L82.44,38.20 L92.83,31.13 L103.65,24.74 L114.84,19.03 L126.38,14.04 L138.20,9.79 L150.26,6.28 L162.52,3.54 L174.93,1.58 L187.44,0.39 L200.00,0.00 L212.56,0.39 L225.07,1.58 L237.48,3.54 L249.74,6.28 L261.80,9.79 L273.62,14.04 L285.16,19.03 L296.35,24.74 L307.17,31.13 L317.56,38.20 L327.48,45.90 L336.91,54.21 L345.79,63.09 L354.10,72.52 L361.80,82.44 L368.87,92.83 L375.26,103.65 L380.97,114.84 L385.96,126.38 L390.21,138.20 L393.72,150.26 L396.46,162.52 L398.42,174.93 L399.61,187.44 L400.00,200.00"]
RenderForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
RenderBlock {div} at (0,0) size 400x65
RenderText {#text} at (136,0) size 127x65
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
index 753254d..fae2bf7 100644
--- a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
+++ b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
@@ -1,19 +1,19 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x375
- RenderBlock {html} at (0,0) size 800x317
- RenderBody {body} at (8,10) size 784x297
- RenderBlock {p} at (0,0) size 784x30 [color=#000080]
- RenderText {#text} at (0,0) size 707x30
- text run at (0,0) width 707: "The word \"TEST \" should appear twice below, the same size each time."
- RenderBlock (anonymous) at (0,40) size 784x127
- RenderSVGRoot {svg} at (8,50) size 400x120
- RenderPath {rect} at (8,50) size 400x120 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#EEEEEE]}] [data="M0.00,0.00 L60.00,0.00 L60.00,12.00 L0.00,12.00 L0.00,0.00"]
+layer at (0,0) size 800x337
+ RenderBlock {html} at (0,0) size 800x311
+ RenderBody {body} at (8,10) size 784x291
+ RenderBlock {p} at (0,0) size 784x25 [color=#000080]
+ RenderText {#text} at (0,0) size 585x25
+ text run at (0,0) width 585: "The word \"TEST \" should appear twice below, the same size each time."
+ RenderBlock (anonymous) at (0,35) size 784x126
+ RenderSVGRoot {svg} at (8,45) size 400x120
+ RenderPath {rect} at (8,45) size 400x120 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#EEEEEE]}] [data="M0.00,0.00 L60.00,0.00 L60.00,12.00 L0.00,12.00 L0.00,0.00"]
RenderForeignObject {foreignObject} at (0,0) size 60x10
RenderBlock {div} at (0,0) size 60x13 [color=#000080]
RenderText {#text} at (0,0) size 27x13
text run at (0,0) width 27: "TEST"
RenderText {#text} at (0,0) size 0x0
- RenderBlock {div} at (0,177) size 400x120 [color=#000080] [bgcolor=#EEEEEE]
- RenderText {#text} at (0,0) size 368x188
- text run at (0,0) width 368: "TEST"
+ RenderBlock {div} at (0,171) size 400x120 [color=#000080] [bgcolor=#EEEEEE]
+ RenderText {#text} at (0,0) size 307x156
+ text run at (0,0) width 307: "TEST"
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.txt b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.txt
index 200e32b..6c06739 100644
--- a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.txt
+++ b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.txt
@@ -1,15 +1,15 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x314
- RenderBlock {html} at (0,0) size 800x314
- RenderBody {body} at (8,23) size 784x283
- RenderBlock {p} at (0,0) size 784x30 [color=#000080]
- RenderText {#text} at (0,0) size 754x30
- text run at (0,0) width 754: "Zoom in and out. The following two squares should always be the same size."
- RenderBlock {div} at (0,53) size 100x100 [bgcolor=#000080]
- RenderBlock (anonymous) at (0,176) size 784x107
- RenderSVGRoot {svg} at (8,199) size 100x100
- RenderPath {rect} at (8,199) size 100x100 [fill={[type=SOLID] [color=#000080]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 L0.00,0.00"]
+layer at (0,0) size 800x296
+ RenderBlock {html} at (0,0) size 800x296
+ RenderBody {body} at (8,19) size 784x269
+ RenderBlock {p} at (0,0) size 784x25 [color=#000080]
+ RenderText {#text} at (0,0) size 623x25
+ text run at (0,0) width 623: "Zoom in and out. The following two squares should always be the same size."
+ RenderBlock {div} at (0,44) size 100x100 [bgcolor=#000080]
+ RenderBlock (anonymous) at (0,163) size 784x106
+ RenderSVGRoot {svg} at (8,182) size 100x100
+ RenderPath {rect} at (8,182) size 100x100 [fill={[type=SOLID] [color=#000080]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 L0.00,0.00"]
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/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.txt b/LayoutTests/platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.txt
index e9371c9..a0d2a79 100644
--- a/LayoutTests/platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.txt
+++ b/LayoutTests/platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.txt
@@ -1,27 +1,27 @@
-layer at (0,0) size 784x648
- RenderView at (0,0) size 784x600
-layer at (0,0) size 784x648
- RenderBlock {html} at (0,0) size 784x648
- RenderBody {body} at (8,8) size 768x617
- RenderBlock (anonymous) at (0,0) size 768x60
- RenderText {#text} at (0,0) size 736x60
- text run at (0,0) width 373: "The two blocks should look identical. "
- text run at (373,0) width 363: "One uses an SVG, and the other just"
- text run at (0,30) width 256: "uses a normal HTML div."
- RenderBlock {p} at (0,83) size 768x30
- RenderText {#text} at (0,0) size 560x30
- text run at (0,0) width 560: "There should be a red, white and blue pattern below this"
- RenderSVGRoot {svg} at (18,154) size 140x140
- RenderPath {rect} at (38,174) size 100x100 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 L0.00,0.00"]
- RenderBlock {p} at (0,296) size 768x30
- RenderText {#text} at (0,0) size 561x30
- text run at (0,0) width 561: "There should be a red, white and blue pattern above this"
- RenderBlock {hr} at (0,349) size 768x2 [border: (1px inset #000000)]
- RenderBlock {p} at (0,374) size 768x30
- RenderText {#text} at (0,0) size 560x30
- text run at (0,0) width 560: "There should be a red, white and blue pattern below this"
- RenderBlock (floating) {div} at (10,437) size 140x140 [border: (10px solid #FF0000)]
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x594
+ RenderBlock {html} at (0,0) size 800x594
+ RenderBody {body} at (8,8) size 784x567
+ RenderBlock (anonymous) at (0,0) size 784x50
+ RenderText {#text} at (0,0) size 725x50
+ text run at (0,0) width 309: "The two blocks should look identical. "
+ text run at (309,0) width 416: "One uses an SVG, and the other just uses a normal"
+ text run at (0,25) width 95: "HTML div."
+ RenderBlock {p} at (0,69) size 784x25
+ RenderText {#text} at (0,0) size 462x25
+ text run at (0,0) width 462: "There should be a red, white and blue pattern below this"
+ RenderSVGRoot {svg} at (18,131) size 140x140
+ RenderPath {rect} at (38,151) size 100x100 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 L0.00,0.00"]
+ RenderBlock {p} at (0,273) size 784x25
+ RenderText {#text} at (0,0) size 463x25
+ text run at (0,0) width 463: "There should be a red, white and blue pattern above this"
+ RenderBlock {hr} at (0,317) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {p} at (0,338) size 784x25
+ RenderText {#text} at (0,0) size 462x25
+ text run at (0,0) width 462: "There should be a red, white and blue pattern below this"
+ RenderBlock (floating) {div} at (10,392) size 140x140 [border: (10px solid #FF0000)]
RenderBlock {div} at (20,20) size 100x100 [bgcolor=#0000FF]
- RenderBlock {p} at (0,587) size 768x30
- RenderText {#text} at (0,0) size 561x30
- text run at (0,0) width 561: "There should be a red, white and blue pattern above this"
+ RenderBlock {p} at (0,542) size 784x25
+ RenderText {#text} at (0,0) size 463x25
+ text run at (0,0) width 463: "There should be a red, white and blue pattern above this"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list