Mercurial > mozreview > gecko / changeset / 142a200eb1b1d62e4e39d25e053a36ab0ca20723
summary | shortlog | changelog | pushlog | graph | tags | bookmarks | branches | files | changeset | raw | zip | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bug 1306769 - Update tests from CSSWG repo and remove fails annotation for css-multicol-1/multicol-rule-color-inherit-002.xht draft
authorNeerja Pancholi <npancholi@mozilla.com>
Fri, 04 Nov 2016 12:36:27 -0700
changeset 434082 142a200eb1b1d62e4e39d25e053a36ab0ca20723
parent 432854 92452e2456a7032eb14a92de9f215dd89bc2b7b0
child 536017 6f05b6dadb5821ce093ccc6898747e3ecefcf11a
push id34716
push userbmo:npancholi@mozilla.com
push dateFri, 04 Nov 2016 20:31:44 +0000
bugs1306769
milestone52.0a1
Bug 1306769 - Update tests from CSSWG repo and remove fails annotation for css-multicol-1/multicol-rule-color-inherit-002.xht MozReview-Commit-ID: 6UL13vOQqlq
layout/reftests/w3c-css/failures.list file | annotate | diff | comparison | revisions
layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-inherit-002.xht file | annotate | diff | comparison | revisions
layout/reftests/w3c-css/received/import.log file | annotate | diff | comparison | revisions
layout/reftests/w3c-css/received/reftest.list file | annotate | diff | comparison | revisions 
--- a/layout/reftests/w3c-css/failures.list
+++ b/layout/reftests/w3c-css/failures.list
@@ -150,19 +150,16 @@ fails css-multicol-1/multicol-width-nega
 fuzzy(225,1060) css-multicol-1/multicol-width-large-001.xht
 fails css-multicol-1/multicol-width-small-001.xht
 fuzzy(225,1060) css-multicol-1/multicol-width-invalid-001.xht
 fuzzy(225,1060) css-multicol-1/multicol-width-large-002.xht
 fails css-multicol-1/multicol-zero-height-001.xht
 fuzzy(225,13600) css-multicol-1/multicol-nested-column-rule-001.xht
 fuzzy(94,256) css-multicol-1/multicol-rule-none-000.xht
 
-#Fails because of regression (Bug 1306769)
-fails css-multicol-1/multicol-rule-color-inherit-002.xht
-
 #This test seems to pass only on Linux-opt build, fails on everything else
 #Therefore using fuzzy annotation as a catch all
 fuzzy(255,2808) css-multicol-1/multicol-rule-large-001.xht
 
 #Fails because column-span property not implemented (Bug 616436)
 fails css-multicol-1/multicol-fill-auto-block-children-001.xht
 fails css-multicol-1/multicol-fill-auto-block-children-002.xht
 fails css-multicol-1/multicol-span-all-block-sibling-003.xht
--- a/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-inherit-002.xht
+++ b/layout/reftests/w3c-css/received/css-multicol-1/multicol-rule-color-inherit-002.xht
@@ -1,34 +1,35 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Multi-column Layout Test: -moz-column-rule-color: inherit (complex)</title>
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-09-03 -->
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-09-03 and 2016-10-02 -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crc" title="4.2. '-moz-column-rule-color'" />
   <link rel="help" href="http://www.w3.org/TR/css3-values/#common-keywords" title="3.1.1. CSS-wide keywords: 'initial' and 'inherit'" />
+  <link rel="help" href="https://drafts.csswg.org/css-color-4/#currentcolor-color" title="5.2. The 'currentcolor' keyword" />
   <link rel="match" href="multicol-rule-color-inherit-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that, by default, -moz-column-rule-color is the current color applying to the element." />
+  <meta name="assert" content="In this test, div#parent's computed '-moz-column-rule-color' is given by div#parent's 'currentcolor' (a reserved keyword) and not 'red'. Then div.child's '-moz-column-rule-color' take such specified value ('currentcolor') from its parent (due to 'inherit' keyword) and not 'red'. And then, it is applied to div.child's '-moz-column-rule-color'." />
 <style type="text/css"><![CDATA[
 @font-face {
   font-family: Ahem;
   src: url("../../../fonts/Ahem.ttf");
 }
 ]]></style>
   <style type="text/css"><![CDATA[
   div#parent
   {
-  color: green;
-  font: 1.25em/1 Ahem;
+  color: red;
+  font: 20px/1 Ahem;
   }
 
   div.child
   {
-  color: red;
+  color: green;
   display: inline-block;
   font-size: 1em;
   width: 5em;
 
   -moz-column-count: 3;
   -moz-column-gap: 1em;
   -moz-column-rule-color: inherit;
   -moz-column-rule-style: solid;
@@ -118,9 +119,9 @@
 	&nbsp;
 	&nbsp;
 	&nbsp;
 	</div>
 
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/layout/reftests/w3c-css/received/import.log
+++ b/layout/reftests/w3c-css/received/import.log
@@ -1,9 +1,9 @@
-Importing revision: fe6a8153b7037a9f66dabb99a872c9779a4d9cca
+Importing revision: d261d6def2373f64d94b113860b29d3e45a02bd1
 from repository: https://hg.csswg.org/test/
 Importing css-conditional-3/at-media-whitespace-optional-001.html to css-conditional-3/at-media-whitespace-optional-001.html
 Importing css-conditional-3/reference/background-lime.html to css-conditional-3/background-lime.html
 Importing css-conditional-3/at-media-whitespace-optional-002.html to css-conditional-3/at-media-whitespace-optional-002.html
 Importing css-conditional-3/at-supports-001.html to css-conditional-3/at-supports-001.html
 Importing css-conditional-3/at-supports-001-ref.html to css-conditional-3/at-supports-001-ref.html
 Importing css-conditional-3/at-supports-002.html to css-conditional-3/at-supports-002.html
 Importing css-conditional-3/at-supports-003.html to css-conditional-3/at-supports-003.html
--- a/layout/reftests/w3c-css/received/reftest.list
+++ b/layout/reftests/w3c-css/received/reftest.list
@@ -119,17 +119,17 @@ fuzzy(204,1844) fuzzy-if(skiaContent,208
 fuzzy-if(OSX,61,2) fuzzy-if(skiaContent,64,2) HTTP(../../..) == css-multicol-1/multicol-reduce-000.xht css-multicol-1/multicol-reduce-000-ref.xht
 fuzzy-if(OSX,8,20) HTTP(../../..) == css-multicol-1/multicol-rule-000.xht css-multicol-1/multicol-rule-000-ref.xht
 fuzzy(116,1584) HTTP(../../..) == css-multicol-1/multicol-rule-001.xht css-multicol-1/multicol-rule-001-ref.xht
 fails HTTP(../../..) == css-multicol-1/multicol-rule-002.xht css-multicol-1/multicol-rule-ref.xht
 fails-if(OSX||winWidget) HTTP(../../..) == css-multicol-1/multicol-rule-003.xht css-multicol-1/multicol-rule-003-ref.xht
 HTTP(../../..) == css-multicol-1/multicol-rule-004.xht css-multicol-1/multicol-rule-004-ref.xht
 fails-if(OSX||winWidget) HTTP(../../..) == css-multicol-1/multicol-rule-color-001.xht css-multicol-1/multicol-rule-color-001-ref.xht
 HTTP(../../..) == css-multicol-1/multicol-rule-color-inherit-001.xht css-multicol-1/multicol-rule-color-inherit-001-ref.xht
-fails HTTP(../../..) == css-multicol-1/multicol-rule-color-inherit-002.xht css-multicol-1/multicol-rule-color-inherit-001-ref.xht
+HTTP(../../..) == css-multicol-1/multicol-rule-color-inherit-002.xht css-multicol-1/multicol-rule-color-inherit-001-ref.xht
 fuzzy(106,354) HTTP(../../..) == css-multicol-1/multicol-rule-dashed-000.xht css-multicol-1/multicol-rule-dashed-000-ref.xht
 fuzzy(106,354) HTTP(../../..) == css-multicol-1/multicol-rule-dotted-000.xht css-multicol-1/multicol-rule-dotted-000-ref.xht
 fuzzy(106,354) HTTP(../../..) == css-multicol-1/multicol-rule-double-000.xht css-multicol-1/multicol-rule-double-000-ref.xht
 fails-if(OSX||winWidget) HTTP(../../..) == css-multicol-1/multicol-rule-fraction-001.xht css-multicol-1/multicol-rule-fraction-001-ref.xht
 fails-if(OSX||winWidget) HTTP(../../..) == css-multicol-1/multicol-rule-fraction-002.xht css-multicol-1/multicol-rule-fraction-002-ref.xht
 fails HTTP(../../..) == css-multicol-1/multicol-rule-fraction-003.xht css-multicol-1/multicol-rule-fraction-3-ref.xht
 fuzzy(106,354) HTTP(../../..) == css-multicol-1/multicol-rule-groove-000.xht css-multicol-1/multicol-rule-groove-000-ref.xht
 fuzzy(94,256) HTTP(../../..) == css-multicol-1/multicol-rule-hidden-000.xht css-multicol-1/multicol-rule-hidden-000-ref.xht
gecko
Deployed from 4e825768105f at 2024-04-08T16:23:58Z.