[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:11 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit ccece733fa2ca11de1cd5d27ac0b35f4ccfe5e60
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 27 23:55:44 2010 +0000

    2010-08-27  Ryosuke Niwa  <rniwa at webkit.org>
    
            Unreviewed; chromium rebaseline for r66247.
    
            * platform/chromium-mac/fast/multicol/span/span-as-nested-columns-child-expected.txt:
            * platform/chromium-mac/tables/mozilla_expected_failures/bugs/bug56024-expected.txt:
            * platform/chromium-win/fast/multicol/span/span-as-nested-columns-child-expected.txt:
            * platform/chromium-win/tables/mozilla_expected_failures/bugs/bug56024-expected.txt:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66278 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 203252d..32eddc8 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-27  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Unreviewed; chromium rebaseline for r66247.
+
+        * platform/chromium-mac/fast/multicol/span/span-as-nested-columns-child-expected.txt:
+        * platform/chromium-mac/tables/mozilla_expected_failures/bugs/bug56024-expected.txt:
+        * platform/chromium-win/fast/multicol/span/span-as-nested-columns-child-expected.txt:
+        * platform/chromium-win/tables/mozilla_expected_failures/bugs/bug56024-expected.txt:
+
 2010-08-27  Tony Chang  <tony at chromium.org>
 
         Unreviewed, updating chromium test expectations.
diff --git a/LayoutTests/platform/chromium-mac/fast/multicol/span/span-as-nested-columns-child-expected.txt b/LayoutTests/platform/chromium-mac/fast/multicol/span/span-as-nested-columns-child-expected.txt
index e8b2763..800f0b7 100644
--- a/LayoutTests/platform/chromium-mac/fast/multicol/span/span-as-nested-columns-child-expected.txt
+++ b/LayoutTests/platform/chromium-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/chromium-mac/tables/mozilla_expected_failures/bugs/bug56024-expected.txt b/LayoutTests/platform/chromium-mac/tables/mozilla_expected_failures/bugs/bug56024-expected.txt
index ea5341c..d90bd20 100644
--- a/LayoutTests/platform/chromium-mac/tables/mozilla_expected_failures/bugs/bug56024-expected.txt
+++ b/LayoutTests/platform/chromium-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/chromium-win/fast/multicol/span/span-as-nested-columns-child-expected.txt b/LayoutTests/platform/chromium-win/fast/multicol/span/span-as-nested-columns-child-expected.txt
index 98252b3..77422a0 100644
--- a/LayoutTests/platform/chromium-win/fast/multicol/span/span-as-nested-columns-child-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/multicol/span/span-as-nested-columns-child-expected.txt
@@ -5,8 +5,8 @@ layer at (0,0) size 785x1345
     RenderBody {BODY} at (8,16) size 769x1313
 layer at (8,16) size 760x415
   RenderBlock {DIV} at (0,0) size 760x415 [border: (5px solid #800000)]
-    RenderBlock (anonymous multi-column span) at (5,24) size 750x27
-      RenderBlock {H2} at (0,0) size 750x27 [bgcolor=#EEEEEE]
+    RenderBlock (anonymous multi-column span) at (5,24) size 750x27 [color=#FFFFFF]
+      RenderBlock {H2} at (0,0) size 750x27 [color=#000000] [bgcolor=#EEEEEE]
         RenderText {#text} at (0,0) size 660x26
           text run at (0,0) width 660: "This is a spanning element at the beginning of the columns block."
 layer at (13,86) size 750x340
@@ -52,8 +52,8 @@ layer at (13,86) size 750x340
         text run at (0,420) width 143: "Nulla varius enim ac mi."
 layer at (8,447) size 760x415
   RenderBlock {DIV} at (0,431) size 760x415 [border: (5px solid #800000)]
-    RenderBlock (anonymous multi-column span) at (5,364) size 750x27
-      RenderBlock {H2} at (0,0) size 750x27 [bgcolor=#EEEEEE]
+    RenderBlock (anonymous multi-column span) at (5,364) size 750x27 [color=#FFFFFF]
+      RenderBlock {H2} at (0,0) size 750x27 [color=#000000] [bgcolor=#EEEEEE]
         RenderText {#text} at (0,0) size 596x26
           text run at (0,0) width 596: "This is a spanning element at the end of the columns block."
 layer at (13,452) size 750x340
@@ -99,8 +99,8 @@ layer at (13,452) size 750x340
         text run at (0,220) width 143: "Nulla varius enim ac mi."
 layer at (8,878) size 760x451
   RenderBlock {DIV} at (0,862) size 760x451 [border: (5px solid #800000)]
-    RenderBlock (anonymous multi-column span) at (5,164) size 750x27
-      RenderBlock {H2} at (0,0) size 750x27 [bgcolor=#EEEEEE]
+    RenderBlock (anonymous multi-column span) at (5,164) size 750x27 [color=#FFFFFF]
+      RenderBlock {H2} at (0,0) size 750x27 [color=#000000] [bgcolor=#EEEEEE]
         RenderText {#text} at (0,0) size 629x26
           text run at (0,0) width 629: "This is a spanning element in the middle of the columns block."
 layer at (13,883) size 750x140
diff --git a/LayoutTests/platform/chromium-win/tables/mozilla_expected_failures/bugs/bug56024-expected.txt b/LayoutTests/platform/chromium-win/tables/mozilla_expected_failures/bugs/bug56024-expected.txt
index a42853b..6448870 100644
--- a/LayoutTests/platform/chromium-win/tables/mozilla_expected_failures/bugs/bug56024-expected.txt
+++ b/LayoutTests/platform/chromium-win/tables/mozilla_expected_failures/bugs/bug56024-expected.txt
@@ -25,7 +25,7 @@ layer at (0,0) size 800x104
                     text run at (0,20) width 79: "makeup sale."
                     text run at (0,40) width 65: "Save up to"
                     text run at (0,60) width 33: "47%."
-              RenderBlock (anonymous) at (1,81) size 94x0
-                RenderBlock {FORM} at (0,0) size 94x0 [color=#CC3333]
+              RenderBlock (anonymous) at (1,81) size 94x0 [color=#CC3333]
+                RenderBlock {FORM} at (0,0) size 94x0
               RenderBlock (anonymous) at (1,81) size 94x0
                 RenderInline {FONT} at (0,0) size 0x0 [color=#CC3333]

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list