[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

kenneth at webkit.org kenneth at webkit.org
Wed Apr 7 23:16:25 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit f95bdf1e8b9f71916e343979318a707d88ecc086
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 30 15:00:55 2009 +0000

    Unreviewed layout test fixes.
    
    Patch by Kenneth Rohde Christiansen <kenneth at webkit.org> on 2009-10-30
    The existing excepted results were wrong, due to the visited links not
    being reset between tests.
    
    This was fixed in r50329, so updating the results.
    
    * platform/qt/fast/block/margin-collapse/block-inside-inline/010-expected.txt:
    * platform/qt/fast/block/margin-collapse/block-inside-inline/011-expected.txt:
    * platform/qt/fast/block/margin-collapse/block-inside-inline/012-expected.txt:
    * platform/qt/fast/block/margin-collapse/block-inside-inline/015-expected.txt:
    * platform/qt/fast/block/margin-collapse/block-inside-inline/016-expected.txt:
    * platform/qt/fast/block/margin-collapse/block-inside-inline/020-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50335 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4f9d98e..ac04b76 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2009-10-30  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Unreviewed layout test fixes.
+
+        The existing excepted results were wrong, due to the visited links not
+        being reset between tests.
+
+        This was fixed in r50329, so updating the results.
+
+        * platform/qt/fast/block/margin-collapse/block-inside-inline/010-expected.txt:
+        * platform/qt/fast/block/margin-collapse/block-inside-inline/011-expected.txt:
+        * platform/qt/fast/block/margin-collapse/block-inside-inline/012-expected.txt:
+        * platform/qt/fast/block/margin-collapse/block-inside-inline/015-expected.txt:
+        * platform/qt/fast/block/margin-collapse/block-inside-inline/016-expected.txt:
+        * platform/qt/fast/block/margin-collapse/block-inside-inline/020-expected.txt:
+
 2009-10-30  Andras Becsi  <becsi.andras at stud.u-szeged.hu>
 
         Reviewed by Holger Hans Peter Freyther.
diff --git a/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/010-expected.txt b/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/010-expected.txt
index 6b739a5..9d3beaf 100644
--- a/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/010-expected.txt
+++ b/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/010-expected.txt
@@ -82,7 +82,7 @@ layer at (0,0) size 800x362
       RenderBlock {P} at (0,309) size 784x21
         RenderText {#text} at (0,0) size 293x21
           text run at (0,0) width 293: "This test is meaningless if you don't pass "
-        RenderInline {A} at (0,0) size 56x21 [color=#551A8B]
+        RenderInline {A} at (0,0) size 56x21 [color=#0000EE]
           RenderText {#text} at (293,0) size 56x21
             text run at (293,0) width 56: "test 006"
         RenderText {#text} at (349,0) size 4x21
diff --git a/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/011-expected.txt b/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/011-expected.txt
index 86a2853..8909ad1 100644
--- a/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/011-expected.txt
+++ b/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/011-expected.txt
@@ -112,7 +112,7 @@ layer at (0,0) size 800x362
       RenderBlock {P} at (0,309) size 784x21
         RenderText {#text} at (0,0) size 293x21
           text run at (0,0) width 293: "This test is meaningless if you don't pass "
-        RenderInline {A} at (0,0) size 56x21 [color=#551A8B]
+        RenderInline {A} at (0,0) size 56x21 [color=#0000EE]
           RenderText {#text} at (293,0) size 56x21
             text run at (293,0) width 56: "test 006"
         RenderText {#text} at (349,0) size 4x21
diff --git a/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/012-expected.txt b/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/012-expected.txt
index ce19288..4f72139 100644
--- a/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/012-expected.txt
+++ b/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/012-expected.txt
@@ -32,7 +32,7 @@ layer at (0,0) size 800x362
       RenderBlock {P} at (0,309) size 784x21
         RenderText {#text} at (0,0) size 293x21
           text run at (0,0) width 293: "This test is meaningless if you don't pass "
-        RenderInline {A} at (0,0) size 56x21 [color=#551A8B]
+        RenderInline {A} at (0,0) size 56x21 [color=#0000EE]
           RenderText {#text} at (293,0) size 56x21
             text run at (293,0) width 56: "test 006"
         RenderText {#text} at (349,0) size 4x21
diff --git a/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/015-expected.txt b/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/015-expected.txt
index 68275ae..38816d1 100644
--- a/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/015-expected.txt
+++ b/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/015-expected.txt
@@ -39,7 +39,7 @@ layer at (0,0) size 800x362
       RenderBlock {P} at (0,309) size 784x21
         RenderText {#text} at (0,0) size 293x21
           text run at (0,0) width 293: "This test is meaningless if you don't pass "
-        RenderInline {A} at (0,0) size 56x21 [color=#551A8B]
+        RenderInline {A} at (0,0) size 56x21 [color=#0000EE]
           RenderText {#text} at (293,0) size 56x21
             text run at (293,0) width 56: "test 006"
         RenderText {#text} at (349,0) size 4x21
diff --git a/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/016-expected.txt b/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/016-expected.txt
index b527de7..431d6b5 100644
--- a/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/016-expected.txt
+++ b/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/016-expected.txt
@@ -40,7 +40,7 @@ layer at (0,0) size 800x362
       RenderBlock {P} at (0,309) size 784x21
         RenderText {#text} at (0,0) size 293x21
           text run at (0,0) width 293: "This test is meaningless if you don't pass "
-        RenderInline {A} at (0,0) size 56x21 [color=#551A8B]
+        RenderInline {A} at (0,0) size 56x21 [color=#0000EE]
           RenderText {#text} at (293,0) size 56x21
             text run at (293,0) width 56: "test 006"
         RenderText {#text} at (349,0) size 4x21
diff --git a/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/020-expected.txt b/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/020-expected.txt
index cf0487e..bbb285b 100644
--- a/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/020-expected.txt
+++ b/LayoutTests/platform/qt/fast/block/margin-collapse/block-inside-inline/020-expected.txt
@@ -75,7 +75,7 @@ layer at (0,0) size 800x262
       RenderBlock {P} at (0,209) size 784x21
         RenderText {#text} at (0,0) size 71x21
           text run at (0,0) width 71: "See also: "
-        RenderInline {A} at (0,0) size 84x21 [color=#551A8B]
+        RenderInline {A} at (0,0) size 84x21 [color=#0000EE]
           RenderText {#text} at (71,0) size 84x21
             text run at (71,0) width 84: "prerequisite"
         RenderText {#text} at (155,0) size 4x21

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list