[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:44:03 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6a3dd167a5adf58f9c435ee8bc8fbd670434ea31
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 27 23:33:17 2010 +0000
2010-08-27 Ryosuke Niwa <rniwa at webkit.org>
Unreviewed; rebaseline for r66247.
* platform/gtk/fast/multicol/span/span-as-nested-columns-child-expected.txt:
* platform/mac/fast/multicol/span/span-as-nested-columns-child-expected.txt:
* platform/mac/tables/mozilla_expected_failures/bugs/bug56024-expected.txt:
* platform/qt/fast/multicol/span/span-as-nested-columns-child-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66274 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 61a626a..d173129 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-27 Ryosuke Niwa <rniwa at webkit.org>
+
+ Unreviewed; rebaseline for r66247.
+
+ * platform/gtk/fast/multicol/span/span-as-nested-columns-child-expected.txt:
+ * platform/mac/fast/multicol/span/span-as-nested-columns-child-expected.txt:
+ * platform/mac/tables/mozilla_expected_failures/bugs/bug56024-expected.txt:
+ * platform/qt/fast/multicol/span/span-as-nested-columns-child-expected.txt:
+
2010-08-27 Eric Carlson <eric.carlson at apple.com>
Reviewed by Simon Fraser.
diff --git a/LayoutTests/platform/gtk/fast/multicol/span/span-as-nested-columns-child-expected.txt b/LayoutTests/platform/gtk/fast/multicol/span/span-as-nested-columns-child-expected.txt
index c9c4dfd..b79aaa1 100644
--- a/LayoutTests/platform/gtk/fast/multicol/span/span-as-nested-columns-child-expected.txt
+++ b/LayoutTests/platform/gtk/fast/multicol/span/span-as-nested-columns-child-expected.txt
@@ -5,8 +5,8 @@ layer at (0,0) size 781x1399
RenderBody {BODY} at (8,16) size 765x1367
layer at (8,16) size 760x437
RenderBlock {DIV} at (0,0) size 760x437 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,24) size 750x33
- RenderBlock {H2} at (0,0) size 750x33 [bgcolor=#EEEEEE]
+ RenderBlock (anonymous multi-column span) at (5,24) size 750x33 [color=#FFFFFF]
+ RenderBlock {H2} at (0,0) size 750x33 [color=#000000] [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 664x33
text run at (0,0) width 664: "This is a spanning element at the beginning of the columns block."
layer at (13,92) size 750x356
@@ -53,8 +53,8 @@ layer at (13,92) size 750x356
text run at (0,440) width 249: "adipiscing elit. Nulla varius enim ac mi."
layer at (8,469) size 760x441
RenderBlock {DIV} at (0,453) size 760x441 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,384) size 750x33
- RenderBlock {H2} at (0,0) size 750x33 [bgcolor=#EEEEEE]
+ RenderBlock (anonymous multi-column span) at (5,384) size 750x33 [color=#FFFFFF]
+ RenderBlock {H2} at (0,0) size 750x33 [color=#000000] [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 600x33
text run at (0,0) width 600: "This is a spanning element at the end of the columns block."
layer at (13,474) size 750x360
@@ -102,8 +102,8 @@ layer at (13,474) size 750x360
text run at (0,240) width 20: "mi."
layer at (8,926) size 760x457
RenderBlock {DIV} at (0,910) size 760x457 [border: (5px solid #800000)]
- RenderBlock (anonymous multi-column span) at (5,164) size 750x33
- RenderBlock {H2} at (0,0) size 750x33 [bgcolor=#EEEEEE]
+ RenderBlock (anonymous multi-column span) at (5,164) size 750x33 [color=#FFFFFF]
+ RenderBlock {H2} at (0,0) size 750x33 [color=#000000] [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 634x33
text run at (0,0) width 634: "This is a spanning element in the middle of the columns block."
layer at (13,931) size 750x140
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 e8b2763..800f0b7 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
- RenderBlock {H2} at (0,0) size 750x28 [bgcolor=#EEEEEE]
+ RenderBlock (anonymous multi-column span) at (5,24) size 750x28 [color=#FFFFFF]
+ RenderBlock {H2} at (0,0) size 750x28 [color=#000000] [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
- RenderBlock {H2} at (0,0) size 750x28 [bgcolor=#EEEEEE]
+ RenderBlock (anonymous multi-column span) at (5,348) size 750x28 [color=#FFFFFF]
+ RenderBlock {H2} at (0,0) size 750x28 [color=#000000] [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
- RenderBlock {H2} at (0,0) size 750x28 [bgcolor=#EEEEEE]
+ RenderBlock (anonymous multi-column span) at (5,150) size 750x28 [color=#FFFFFF]
+ RenderBlock {H2} at (0,0) size 750x28 [color=#000000] [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/mac/tables/mozilla_expected_failures/bugs/bug56024-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug56024-expected.txt
index ea5341c..d90bd20 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug56024-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug56024-expected.txt
@@ -25,7 +25,7 @@ layer at (0,0) size 800x96
text run at (0,18) width 78: "Fall makeup"
text run at (0,36) width 83: "sale. Save up"
text run at (0,54) width 49: "to 47%."
- RenderBlock (anonymous) at (1,73) size 94x0
- RenderBlock {FORM} at (0,0) size 94x0 [color=#CC3333]
+ RenderBlock (anonymous) at (1,73) size 94x0 [color=#CC3333]
+ RenderBlock {FORM} at (0,0) size 94x0
RenderBlock (anonymous) at (1,73) size 94x0
RenderInline {FONT} at (0,0) size 0x0 [color=#CC3333]
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 8440bb5..9fd34b1 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
- RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
+ RenderBlock (anonymous multi-column span) at (5,24) size 750x31 [color=#FFFFFF]
+ RenderBlock {H2} at (0,0) size 750x31 [color=#000000] [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
- RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
+ RenderBlock (anonymous multi-column span) at (5,423) size 750x31 [color=#FFFFFF]
+ RenderBlock {H2} at (0,0) size 750x31 [color=#000000] [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
- RenderBlock {H2} at (0,0) size 750x31 [bgcolor=#EEEEEE]
+ RenderBlock (anonymous multi-column span) at (5,187) size 750x31 [color=#FFFFFF]
+ RenderBlock {H2} at (0,0) size 750x31 [color=#000000] [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