[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

ossy at webkit.org ossy at webkit.org
Wed Dec 22 15:53:46 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 6a2aea548549117adc25c8cc54a8951ea9df1aca
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 16 10:29:16 2010 +0000

    .
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72069 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c9f266d..ec13e9e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-11-16  Csaba Osztrogonac  <ossy at webkit.org>
+
+        Unreviewed. Update Qt specific expected results after r72055.
+
+        * platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.checksum: Added.
+        * platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.png: Added.
+        * platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt:
+        * platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.checksum: Added.
+        * platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.png: Added.
+        * platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt:
+        * platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.checksum: Added.
+        * platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.png: Added.
+        * platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.txt:
+        * platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.checksum: Added.
+        * platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.png: Added.
+        * platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.txt:
+
 2010-11-16  Alejandro G. Castro  <alex at igalia.com>
 
         Unreviewed, updated test expectations for GTK and skip tests using
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.checksum b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.checksum
new file mode 100644
index 0000000..5517112
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.checksum
@@ -0,0 +1 @@
+1f895bf10e99d85bc0f77b122e4a0469
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.png b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.png
new file mode 100644
index 0000000..37deb70
Binary files /dev/null and b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.png differ
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 ab51811..05a8c91 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 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
-          RenderSVGPath {rect} at (8,63) size 400x400 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=400.00] [height=400.00]
-          RenderSVGPath {circle} at (8,63) size 400x400 [fill={[type=SOLID] [color=#000080]}] [cx=200.00] [cy=200.00] [r=200.00]
+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
+          RenderSVGPath {rect} at (8,76) size 400x400 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=400.00] [height=400.00]
+          RenderSVGPath {circle} at (8,76) size 400x400 [fill={[type=SOLID] [color=#000080]}] [cx=200.00] [cy=200.00] [r=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.checksum b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.checksum
new file mode 100644
index 0000000..6742d27
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.checksum
@@ -0,0 +1 @@
+8e05402d3e2e159acba279c93334401c
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.png b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.png
new file mode 100644
index 0000000..3c4f86b
Binary files /dev/null and b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.png differ
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 a5ebb6d..2a72272 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 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
-          RenderSVGPath {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]}] [x=0.00] [y=0.00] [width=60.00] [height=12.00]
+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
+          RenderSVGPath {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]}] [x=0.00] [y=0.00] [width=60.00] [height=12.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,171) size 400x120 [color=#000080] [bgcolor=#EEEEEE]
-        RenderText {#text} at (0,0) size 307x156
-          text run at (0,0) width 307: "TEST"
+      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"
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.checksum b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.checksum
new file mode 100644
index 0000000..4839e40
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.checksum
@@ -0,0 +1 @@
+3fcf2edcfcab10499963cf3c40940234
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.png b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.png
new file mode 100644
index 0000000..9c1080d
Binary files /dev/null and b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-rendering-model-004-expected.png differ
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 ae1720a..c78733f 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 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
-          RenderSVGPath {rect} at (8,182) size 100x100 [fill={[type=SOLID] [color=#000080]}] [x=0.00] [y=0.00] [width=100.00] [height=100.00]
+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
+          RenderSVGPath {rect} at (8,199) size 100x100 [fill={[type=SOLID] [color=#000080]}] [x=0.00] [y=0.00] [width=100.00] [height=100.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.checksum b/LayoutTests/platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.checksum
new file mode 100644
index 0000000..95c5db7
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.checksum
@@ -0,0 +1 @@
+7e664cc629d2302730e4bd9d64b362ce
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.png b/LayoutTests/platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.png
new file mode 100644
index 0000000..21d6311
Binary files /dev/null and b/LayoutTests/platform/qt/svg/zoom/text/zoom-svg-float-border-padding-expected.png differ
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 b630d62..c04a253 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 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
-        RenderSVGPath {rect} at (38,151) size 100x100 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=100.00] [height=100.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)]
+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
+        RenderSVGPath {rect} at (38,174) size 100x100 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=100.00] [height=100.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)]
         RenderBlock {div} at (20,20) size 100x100 [bgcolor=#0000FF]
-      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"
+      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"

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list