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

ossy at webkit.org ossy at webkit.org
Wed Dec 22 18:02:11 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 6cefbb4ebfb19bc8099e7ddda5d029314a12214b
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 6 13:21:47 2010 +0000

    Unreviewed.
    
    Add Qt specific expected results for tests introduced in r73296.
    Compared to Mac png files and Mac expected files.
    
    * platform/qt/fast/multicol/span/anonymous-before-child-parent-crash-expected.checksum: Added.
    * platform/qt/fast/multicol/span/anonymous-before-child-parent-crash-expected.png: Added.
    * platform/qt/fast/multicol/span/anonymous-before-child-parent-crash-expected.txt: Added.
    * platform/qt/fast/multicol/span/anonymous-split-block-crash-expected.checksum: Added.
    * platform/qt/fast/multicol/span/anonymous-split-block-crash-expected.png: Added.
    * platform/qt/fast/multicol/span/anonymous-split-block-crash-expected.txt: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73359 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9dcc8c6..a918b51 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-06  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Unreviewed.
+
+        Add Qt specific expected results for tests introduced in r73296.
+        Compared to Mac png files and Mac expected files.
+
+        * platform/qt/fast/multicol/span/anonymous-before-child-parent-crash-expected.checksum: Added.
+        * platform/qt/fast/multicol/span/anonymous-before-child-parent-crash-expected.png: Added.
+        * platform/qt/fast/multicol/span/anonymous-before-child-parent-crash-expected.txt: Added.
+        * platform/qt/fast/multicol/span/anonymous-split-block-crash-expected.checksum: Added.
+        * platform/qt/fast/multicol/span/anonymous-split-block-crash-expected.png: Added.
+        * platform/qt/fast/multicol/span/anonymous-split-block-crash-expected.txt: Added.
+
 2010-12-05  Rob Buis  <rwlbuis at gmail.com>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/LayoutTests/platform/qt/fast/multicol/span/anonymous-before-child-parent-crash-expected.checksum b/LayoutTests/platform/qt/fast/multicol/span/anonymous-before-child-parent-crash-expected.checksum
new file mode 100644
index 0000000..90eef17
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/multicol/span/anonymous-before-child-parent-crash-expected.checksum
@@ -0,0 +1 @@
+8f98106f26fdb83eda3073ac3867eb8b
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/fast/multicol/span/anonymous-before-child-parent-crash-expected.png b/LayoutTests/platform/qt/fast/multicol/span/anonymous-before-child-parent-crash-expected.png
new file mode 100644
index 0000000..1e2df10
Binary files /dev/null and b/LayoutTests/platform/qt/fast/multicol/span/anonymous-before-child-parent-crash-expected.png differ
diff --git a/LayoutTests/platform/qt/fast/multicol/span/anonymous-before-child-parent-crash-expected.txt b/LayoutTests/platform/qt/fast/multicol/span/anonymous-before-child-parent-crash-expected.txt
new file mode 100644
index 0000000..6f6efe7
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/multicol/span/anonymous-before-child-parent-crash-expected.txt
@@ -0,0 +1,32 @@
+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 784x576
+      RenderBlock {H2} at (0,0) size 784x31 [bgcolor=#EEEEEE]
+        RenderText {#text} at (0,0) size 58x32
+          text run at (0,0) width 58: "PASS"
+layer at (8,58) size 760x234
+  RenderBlock {DIV} at (0,50) size 760x234 [border: (5px solid #800000)]
+    RenderBlock (anonymous multi-column span) at (5,24) size 750x31
+      RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
+        RenderText {#text} at (0,0) size 58x32
+          text run at (0,0) width 58: "PASS"
+layer at (13,132) size 750x139
+  RenderBlock (anonymous multi-column) at (5,74) size 750x139
+    RenderBlock {SPAN} at (0,0) size 367x262
+      RenderBlock (anonymous) at (0,0) size 367x265
+        RenderText {#text} at (0,0) size 367x265
+          text run at (0,0) width 351: "Lorem ipsum dolor sit amet, consectetuer adipiscing"
+          text run at (0,21) width 343: "elit. Nulla varius enim ac mi. Curabitur sollicitudin"
+          text run at (0,42) width 329: "felis quis lectus. Quisque adipiscing rhoncus sem."
+          text run at (0,63) width 367: "Proin nulla purus, vulputate vel, varius ut, euismod et,"
+          text run at (0,84) width 325: "nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+          text run at (0,105) width 315: "convallis adipiscing sem. Nam nonummy enim."
+          text run at (0,139) width 341: "Nullam bibendum lobortis neque. Vestibulum velit"
+          text run at (0,160) width 348: "orci, tempus euismod, pretium quis, interdum vitae,"
+          text run at (0,181) width 326: "nulla. Phasellus eget ante et tortor condimentum"
+          text run at (0,202) width 364: "vestibulum. Suspendisse hendrerit quam nec felis. Sed"
+          text run at (0,223) width 357: "varius turpis vitae pede. Lorem ipsum dolor sit amet,"
+          text run at (0,244) width 184: "consectetuer adipiscing elit."
+      RenderBlock {DL} at (0,278) size 367x0
diff --git a/LayoutTests/platform/qt/fast/multicol/span/anonymous-split-block-crash-expected.checksum b/LayoutTests/platform/qt/fast/multicol/span/anonymous-split-block-crash-expected.checksum
new file mode 100644
index 0000000..7451c20
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/multicol/span/anonymous-split-block-crash-expected.checksum
@@ -0,0 +1 @@
+ac00f83ffa0e40c0ca0e72ad09fc2821
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/fast/multicol/span/anonymous-split-block-crash-expected.png b/LayoutTests/platform/qt/fast/multicol/span/anonymous-split-block-crash-expected.png
new file mode 100644
index 0000000..2f6c93d
Binary files /dev/null and b/LayoutTests/platform/qt/fast/multicol/span/anonymous-split-block-crash-expected.png differ
diff --git a/LayoutTests/platform/qt/fast/multicol/span/anonymous-split-block-crash-expected.txt b/LayoutTests/platform/qt/fast/multicol/span/anonymous-split-block-crash-expected.txt
new file mode 100644
index 0000000..c379a6f
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/multicol/span/anonymous-split-block-crash-expected.txt
@@ -0,0 +1,30 @@
+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,16) size 784x568
+layer at (8,16) size 784x205
+  RenderBlock {DIV} at (0,0) size 784x205 [border: (5px solid #800000)]
+    RenderBlock (anonymous multi-column span) at (5,150) size 774x31
+      RenderBlock {H2} at (0,0) size 774x31 [bgcolor=#EEEEEE]
+        RenderText {#text} at (0,0) size 58x32
+          text run at (0,0) width 58: "PASS"
+layer at (13,21) size 774x126
+  RenderBlock (anonymous multi-column) at (5,5) size 774x126
+    RenderBlock (anonymous) at (0,0) size 379x252
+      RenderInline {JUNK} at (0,0) size 379x252
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 379x252
+          text run at (0,0) width 379: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+          text run at (0,21) width 377: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
+          text run at (0,42) width 347: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
+          text run at (0,63) width 347: "purus, vulputate vel, varius ut, euismod et, nisi. Sed"
+          text run at (0,84) width 327: "vitae felis vel orci sagittis aliquam. Cras convallis"
+          text run at (0,105) width 307: "adipiscing sem. Nam nonummy enim. Nullam"
+          text run at (0,126) width 374: "bibendum lobortis neque. Vestibulum velit orci, tempus"
+          text run at (0,147) width 370: "euismod, pretium quis, interdum vitae, nulla. Phasellus"
+          text run at (0,168) width 299: "eget ante et tortor condimentum vestibulum."
+          text run at (0,189) width 372: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
+          text run at (0,210) width 355: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
+          text run at (0,231) width 96: "adipiscing elit."
+    RenderBlock (anonymous) at (0,252) size 379x0

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list