[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
rniwa at webkit.org
rniwa at webkit.org
Wed Dec 22 12:40:07 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 52d8208b324cb3920ab73a3fbc26c1eaf7e6a49b
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 26 23:03:42 2010 +0000
2010-08-26 Ryosuke Niwa <rniwa at webkit.org>
Unreviewed; rebaseline for r66122.
* platform/mac/fast/multicol/span/span-as-nested-columns-child-expected.txt:
* platform/qt/fast/multicol/span/span-as-nested-columns-child-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66147 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a941319..73aa6aa 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-26 Ryosuke Niwa <rniwa at webkit.org>
+
+ Unreviewed; rebaseline for r66122.
+
+ * platform/mac/fast/multicol/span/span-as-nested-columns-child-expected.txt:
+ * platform/qt/fast/multicol/span/span-as-nested-columns-child-expected.txt:
+
2010-08-26 Martin Robinson <mrobinson at igalia.com>
Updating expected results after r66115.
diff --git a/LayoutTests/platform/mac/fast/multicol/span/span-as-nested-columns-child-expected.txt b/LayoutTests/platform/mac/fast/multicol/span/span-as-nested-columns-child-expected.txt
index 800f0b7..e8b2763 100644
--- a/LayoutTests/platform/mac/fast/multicol/span/span-as-nested-columns-child-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/span/span-as-nested-columns-child-expected.txt
@@ -5,8 +5,8 @@ layer at (0,0) size 785x1278
RenderBody {BODY} at (8,16) size 769x1246
layer at (8,16) size 760x398
RenderBlock {DIV} at (0,0) size 760x398 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,24) size 750x28 [color=#FFFFFF]
- RenderBlock {H2} at (0,0) size 750x28 [color=#000000] [bgcolor=#EEEEEE]
+ RenderBlock (anonymous multi-column span) at (5,24) size 750x28
+ RenderBlock {H2} at (0,0) size 750x28 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 664x28
text run at (0,0) width 664: "This is a spanning element at the beginning of the columns block."
layer at (13,87) size 750x322
@@ -53,8 +53,8 @@ layer at (13,87) size 750x322
text run at (0,396) width 249: "adipiscing elit. Nulla varius enim ac mi."
layer at (8,430) size 760x400
RenderBlock {DIV} at (0,414) size 760x400 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,348) size 750x28 [color=#FFFFFF]
- RenderBlock {H2} at (0,0) size 750x28 [color=#000000] [bgcolor=#EEEEEE]
+ RenderBlock (anonymous multi-column span) at (5,348) size 750x28
+ RenderBlock {H2} at (0,0) size 750x28 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 600x28
text run at (0,0) width 600: "This is a spanning element at the end of the columns block."
layer at (13,435) size 750x324
@@ -102,8 +102,8 @@ layer at (13,435) size 750x324
text run at (0,216) width 20: "mi."
layer at (8,846) size 760x416
RenderBlock {DIV} at (0,830) size 760x416 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,150) size 750x28 [color=#FFFFFF]
- RenderBlock {H2} at (0,0) size 750x28 [color=#000000] [bgcolor=#EEEEEE]
+ RenderBlock (anonymous multi-column span) at (5,150) size 750x28
+ RenderBlock {H2} at (0,0) size 750x28 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 634x28
text run at (0,0) width 634: "This is a spanning element in the middle of the columns block."
layer at (13,851) size 750x126
diff --git a/LayoutTests/platform/qt/fast/multicol/span/span-as-nested-columns-child-expected.txt b/LayoutTests/platform/qt/fast/multicol/span/span-as-nested-columns-child-expected.txt
index 9fd34b1..8440bb5 100644
--- a/LayoutTests/platform/qt/fast/multicol/span/span-as-nested-columns-child-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/span/span-as-nested-columns-child-expected.txt
@@ -5,8 +5,8 @@ layer at (0,0) size 784x1530
RenderBody {BODY} at (8,16) size 768x1498
layer at (8,16) size 760x478
RenderBlock {DIV} at (0,0) size 760x478 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,24) size 750x31 [color=#FFFFFF]
- RenderBlock {H2} at (0,0) size 750x31 [color=#000000] [bgcolor=#EEEEEE]
+ 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 664x32
text run at (0,0) width 664: "This is a spanning element at the beginning of the columns block."
layer at (13,90) size 750x399
@@ -55,8 +55,8 @@ layer at (13,90) size 750x399
text run at (0,504) width 192: "elit. Nulla varius enim ac mi."
layer at (8,510) size 760x478
RenderBlock {DIV} at (0,494) size 760x478 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,423) size 750x31 [color=#FFFFFF]
- RenderBlock {H2} at (0,0) size 750x31 [color=#000000] [bgcolor=#EEEEEE]
+ RenderBlock (anonymous multi-column span) at (5,423) size 750x31
+ RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 600x32
text run at (0,0) width 600: "This is a spanning element at the end of the columns block."
layer at (13,515) size 750x399
@@ -106,8 +106,8 @@ layer at (13,515) size 750x399
text run at (0,273) width 40: "ac mi."
layer at (8,1004) size 760x510
RenderBlock {DIV} at (0,988) size 760x510 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,187) size 750x31 [color=#FFFFFF]
- RenderBlock {H2} at (0,0) size 750x31 [color=#000000] [bgcolor=#EEEEEE]
+ RenderBlock (anonymous multi-column span) at (5,187) size 750x31
+ RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 634x32
text run at (0,0) width 634: "This is a spanning element in the middle of the columns block."
layer at (13,1009) size 750x163
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list