CSS WG multicol-1 tests failures with 1px differences due to baseline difference.

https://bugs.webkit.org/show_bug.cgi?id=149245

Reviewed by Ryosuke Niwa.

Turn off font-aliasing for multicol tests where the reference tests' inline content
end up on a different baseline (fractional difference). (It's not considered a bug, they don't
necessarily match.)

LayoutTests/imported/w3c:

* css/css-multicol-1/multicol-basic-001-expected.html:
* css/css-multicol-1/multicol-basic-001.html:
* css/css-multicol-1/multicol-basic-002-expected.html:
* css/css-multicol-1/multicol-basic-002.html:
* css/css-multicol-1/multicol-basic-003-expected.html:
* css/css-multicol-1/multicol-basic-003.html:
* css/css-multicol-1/multicol-basic-004-expected.html:
* css/css-multicol-1/multicol-basic-004.html:
* css/css-multicol-1/multicol-rule-002-expected.xht:
* css/css-multicol-1/multicol-rule-002.xht:
* css/css-multicol-1/multicol-rule-px-001-expected.xht:
* css/css-multicol-1/multicol-rule-px-001.xht:
* css/css-multicol-1/multicol-rule-stacking-001-expected.xht:
* css/css-multicol-1/multicol-rule-stacking-001.xht:
* css/css-multicol-1/multicol-shorthand-001-expected.xht:
* css/css-multicol-1/multicol-shorthand-001.xht:
* css/css-multicol-1/multicol-span-all-block-sibling-003-expected.xht:
* css/css-multicol-1/multicol-span-all-block-sibling-003.xht:
* css/css-multicol-1/multicol-span-all-margin-nested-firstchild-001-expected.xht:
* css/css-multicol-1/multicol-span-all-margin-nested-firstchild-001.xht:

LayoutTests:

* TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189947 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1fe5a48..60e22d7 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2015-09-17  Zalan Bujtas  <zalan@apple.com>
+
+        CSS WG multicol-1 tests failures with 1px differences due to baseline difference.
+        https://bugs.webkit.org/show_bug.cgi?id=149245
+
+        Reviewed by Ryosuke Niwa.
+
+        Turn off font-aliasing for multicol tests where the reference tests' inline content
+        end up on a different baseline (fractional difference). (It's not considered a bug, they don't
+        necessarily match.)
+
+        * TestExpectations:
+
 2015-09-17  Saam barati  <sbarati@apple.com>
 
         Implement try/catch in the DFG.

diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
index bf90822..f582742 100644 (file)
--- a/LayoutTests/TestExpectations
+++ b/LayoutTests/TestExpectations
@@ -613,19 +613,9 @@ webkit.org/b/148801 imported/w3c/css/css-color-3/t422-rgba-onscreen-multiple-box
 webkit.org/b/148801 imported/w3c/css/css-color-3/t425-hsla-onscreen-multiple-boxes-c.xht [ ImageOnlyFailure ]
 
 # Many CSS WG multicol-1 tests fail with 1px differences
-webkit.org/b/148806 imported/w3c/css/css-multicol-1/multicol-basic-001.html [ ImageOnlyFailure ]
-webkit.org/b/148806 imported/w3c/css/css-multicol-1/multicol-basic-002.html [ ImageOnlyFailure ]
-webkit.org/b/148806 imported/w3c/css/css-multicol-1/multicol-basic-003.html [ ImageOnlyFailure ]
-webkit.org/b/148806 imported/w3c/css/css-multicol-1/multicol-basic-004.html [ ImageOnlyFailure ]
 webkit.org/b/148806 imported/w3c/css/css-multicol-1/multicol-count-large-001.xht [ ImageOnlyFailure ]
 webkit.org/b/148806 imported/w3c/css/css-multicol-1/multicol-count-large-002.xht [ ImageOnlyFailure ]
-webkit.org/b/148806 imported/w3c/css/css-multicol-1/multicol-rule-002.xht [ ImageOnlyFailure ]
-webkit.org/b/148806 imported/w3c/css/css-multicol-1/multicol-rule-px-001.xht [ ImageOnlyFailure ]
-webkit.org/b/148806 imported/w3c/css/css-multicol-1/multicol-rule-stacking-001.xht [ ImageOnlyFailure ]
-webkit.org/b/148806 imported/w3c/css/css-multicol-1/multicol-shorthand-001.xht [ ImageOnlyFailure ]
-webkit.org/b/148806 imported/w3c/css/css-multicol-1/multicol-span-all-block-sibling-003.xht [ ImageOnlyFailure ]
 webkit.org/b/148806 imported/w3c/css/css-multicol-1/multicol-rule-fraction-003.xht [ ImageOnlyFailure ]
-webkit.org/b/148806 imported/w3c/css/css-multicol-1/multicol-span-all-margin-nested-firstchild-001.xht [ ImageOnlyFailure ]
 webkit.org/b/148806 imported/w3c/css/css-multicol-1/multicol-count-computed-002.xht [ ImageOnlyFailure ]
 
 # http://www.w3.org/TR/css3-multicol/#column-span0

diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
index b246674..3e3c755 100644 (file)
--- a/LayoutTests/imported/w3c/ChangeLog
+++ b/LayoutTests/imported/w3c/ChangeLog
@@ -1,3 +1,35 @@
+2015-09-17  Zalan Bujtas  <zalan@apple.com>
+
+        CSS WG multicol-1 tests failures with 1px differences due to baseline difference.
+        https://bugs.webkit.org/show_bug.cgi?id=149245
+
+        Reviewed by Ryosuke Niwa.
+
+        Turn off font-aliasing for multicol tests where the reference tests' inline content
+        end up on a different baseline (fractional difference). (It's not considered a bug, they don't
+        necessarily match.)
+
+        * css/css-multicol-1/multicol-basic-001-expected.html:
+        * css/css-multicol-1/multicol-basic-001.html:
+        * css/css-multicol-1/multicol-basic-002-expected.html:
+        * css/css-multicol-1/multicol-basic-002.html:
+        * css/css-multicol-1/multicol-basic-003-expected.html:
+        * css/css-multicol-1/multicol-basic-003.html:
+        * css/css-multicol-1/multicol-basic-004-expected.html:
+        * css/css-multicol-1/multicol-basic-004.html:
+        * css/css-multicol-1/multicol-rule-002-expected.xht:
+        * css/css-multicol-1/multicol-rule-002.xht:
+        * css/css-multicol-1/multicol-rule-px-001-expected.xht:
+        * css/css-multicol-1/multicol-rule-px-001.xht:
+        * css/css-multicol-1/multicol-rule-stacking-001-expected.xht:
+        * css/css-multicol-1/multicol-rule-stacking-001.xht:
+        * css/css-multicol-1/multicol-shorthand-001-expected.xht:
+        * css/css-multicol-1/multicol-shorthand-001.xht:
+        * css/css-multicol-1/multicol-span-all-block-sibling-003-expected.xht:
+        * css/css-multicol-1/multicol-span-all-block-sibling-003.xht:
+        * css/css-multicol-1/multicol-span-all-margin-nested-firstchild-001-expected.xht:
+        * css/css-multicol-1/multicol-span-all-margin-nested-firstchild-001.xht:
+
 2015-09-17  Chris Dumez  <cdumez@apple.com>
 
         Range.deleteContents cannot delete DocType

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-001-expected.html b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-001-expected.html
index a74aa82..d57038f 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-001-expected.html
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-001-expected.html
@@ -10,6 +10,7 @@
        <style type="text/css">
                .multicol-wrapper>*{
                        font-family: Ahem;
+                       -webkit-font-smoothing: none;
                }
 
                div.multicol-wrapper{

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-001.html b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-001.html
index 37dc110..43f9c88 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-001.html
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-001.html
@@ -13,6 +13,7 @@
        <style type="text/css">
                .multicol-wrapper>*{
                        font-family: Ahem;
+                       -webkit-font-smoothing: none;
                }
 
                div.multicol-wrapper{

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-002-expected.html b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-002-expected.html
index a74aa82..d57038f 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-002-expected.html
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-002-expected.html
@@ -10,6 +10,7 @@
        <style type="text/css">
                .multicol-wrapper>*{
                        font-family: Ahem;
+                       -webkit-font-smoothing: none;
                }
 
                div.multicol-wrapper{

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-002.html b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-002.html
index c91f02e..ecaec5e 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-002.html
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-002.html
@@ -13,6 +13,7 @@
        <style type="text/css">
                .multicol-wrapper>*{
                        font-family: Ahem;
+                       -webkit-font-smoothing: none;
                }
 
                div.multicol-wrapper{

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-003-expected.html b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-003-expected.html
index a74aa82..d57038f 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-003-expected.html
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-003-expected.html
@@ -10,6 +10,7 @@
        <style type="text/css">
                .multicol-wrapper>*{
                        font-family: Ahem;
+                       -webkit-font-smoothing: none;
                }
 
                div.multicol-wrapper{

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-003.html b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-003.html
index ea66bd0..c3166d2 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-003.html
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-003.html
@@ -13,6 +13,7 @@
        <style type="text/css">
                .multicol-wrapper>*{
                        font-family: Ahem;
+                       -webkit-font-smoothing: none;
                }
 
                div.multicol-wrapper{

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-004-expected.html b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-004-expected.html
index a74aa82..d57038f 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-004-expected.html
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-004-expected.html
@@ -10,6 +10,7 @@
        <style type="text/css">
                .multicol-wrapper>*{
                        font-family: Ahem;
+                       -webkit-font-smoothing: none;
                }
 
                div.multicol-wrapper{

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-004.html b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-004.html
index e6f6062..1ba84c5 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-004.html
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-basic-004.html
@@ -13,6 +13,7 @@
        <style type="text/css">
                .multicol-wrapper>*{
                        font-family: Ahem;
+                       -webkit-font-smoothing: none;
                }
 
                div.multicol-wrapper{

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-002-expected.xht b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-002-expected.xht
index 2a98380..f9a70f1 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-002-expected.xht
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-002-expected.xht
@@ -11,6 +11,7 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
+       -webkit-font-smoothing: none;
        line-height: 1em;
        color: black;
        background: yellow;

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-002.xht b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-002.xht
index 2eec71e..c6e4124 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-002.xht
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-002.xht
@@ -14,6 +14,7 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
+       -webkit-font-smoothing: none;
        line-height: 1em;
        color: black;
        background: yellow;

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-px-001-expected.xht b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-px-001-expected.xht
index 2a98380..f9a70f1 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-px-001-expected.xht
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-px-001-expected.xht
@@ -11,6 +11,7 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
+       -webkit-font-smoothing: none;
        line-height: 1em;
        color: black;
        background: yellow;

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-px-001.xht b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-px-001.xht
index 2ae164a..06b6212 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-px-001.xht
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-px-001.xht
@@ -14,6 +14,7 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
+       -webkit-font-smoothing: none;
        line-height: 1em;
        color: black;
        background: yellow;

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-stacking-001-expected.xht b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-stacking-001-expected.xht
index 1eac917..4e27bb3 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-stacking-001-expected.xht
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-stacking-001-expected.xht
@@ -11,6 +11,7 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
+       -webkit-font-smoothing: none;
        line-height: 1em;
        color: black;
        background: blue;

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-stacking-001.xht b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-stacking-001.xht
index 61eb173..229b141 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-stacking-001.xht
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-rule-stacking-001.xht
@@ -14,6 +14,7 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
+       -webkit-font-smoothing: none;
        line-height: 1em;
        color: blue;
        background: red;

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-shorthand-001-expected.xht b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-shorthand-001-expected.xht
index 2a98380..f9a70f1 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-shorthand-001-expected.xht
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-shorthand-001-expected.xht
@@ -11,6 +11,7 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
+       -webkit-font-smoothing: none;
        line-height: 1em;
        color: black;
        background: yellow;

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-shorthand-001.xht b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-shorthand-001.xht
index 81e50d2..580c8e0 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-shorthand-001.xht
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-shorthand-001.xht
@@ -14,6 +14,7 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
+       -webkit-font-smoothing: none;
        line-height: 1em;
        color: black;
        background: yellow;

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-all-block-sibling-003-expected.xht b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-all-block-sibling-003-expected.xht
index e908215..2bc6ac4 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-all-block-sibling-003-expected.xht
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-all-block-sibling-003-expected.xht
@@ -8,6 +8,7 @@
 body>div {
        font-family: ahem;
        font-size: 1em;
+       -webkit-font-smoothing: none;
        line-height: 1;
        color: black;
        background: black;

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-all-block-sibling-003.xht b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-all-block-sibling-003.xht
index 484b603..b53be4c 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-all-block-sibling-003.xht
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-all-block-sibling-003.xht
@@ -11,6 +11,7 @@
 body>div {
        font-family: ahem;
        font-size: 1em;
+       -webkit-font-smoothing: none;
        line-height: 1;
        color: black;
        background: black;

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-all-margin-nested-firstchild-001-expected.xht b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-all-margin-nested-firstchild-001-expected.xht
index 92557cc..6b15320 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-all-margin-nested-firstchild-001-expected.xht
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-all-margin-nested-firstchild-001-expected.xht
@@ -11,6 +11,7 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
+       -webkit-font-smoothing: none;
        line-height: 1em;
        color: navy;
        background: yellow;

diff --git a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-all-margin-nested-firstchild-001.xht b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-all-margin-nested-firstchild-001.xht
index 66402d1..19843b1 100644 (file)
--- a/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-all-margin-nested-firstchild-001.xht
+++ b/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-all-margin-nested-firstchild-001.xht
@@ -14,6 +14,7 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
+       -webkit-font-smoothing: none;
        line-height: 1em;
        color: navy;
        background: yellow;