Backed out changeset 580d1022c398 (bug 1164918) for reftest failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 21 May 2015 12:24:25 -0400
changeset 277354 4c5d42a5e9ad1bd2e27a4a9b959a7cf74e130cb7
parent 277353 0b1516ccf906013239e6c233d230c4e8bb5472bd
child 277355 d4f2547a9e0531028c00eda30a5dfdc2497bf605
push id897
push userjlund@mozilla.com
push dateMon, 14 Sep 2015 18:56:12 +0000
treeherdermozilla-release@9411e2d2b214 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1164918
milestone41.0a1
backs out580d1022c398c0639572c31328e828261c05bad9
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 580d1022c398 (bug 1164918) for reftest failures.
layout/reftests/css-grid/grid-placement-definite-003-ref.html
layout/reftests/css-grid/grid-placement-definite-003.html
layout/reftests/css-grid/reftest.list
layout/style/nsCSSScanner.cpp
layout/style/test/property_database.js
deleted file mode 100644
--- a/layout/reftests/css-grid/grid-placement-definite-003-ref.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML>
-<html><head>
-    <meta charset="utf-8">
-    <title></title>
-    <style type="text/css">
-html,body {
-  font-size:16px;
-  font-family:monospace;
-}
-.grid {
-  height: 60px;
-  border: 1px solid green;
-  position: relative;
-}
-
-span {
-  position: absolute;
-  background: lime;
-  border: 1px solid black;
-  box-sizing: border-box;
-}
-
-.test1 span {
-  top: 0;
-  left: 40px;
-  width: 100px;
-  height: 20px;
-}
-
-.test2 .a {
-  top: 0;
-  left: 0;
-  width: 60px;
-  height: 40px;
-}
-.test2 .b {
-  top: 40px;
-  left: 20px;
-  width: 60px;
-  height: 20px;
-}
-.test2 .c {
-  top: 0;
-  left: 60px;
-  width: 60px;
-  height: 20px;
-}
-
-.test3 span {
-  top: 0;
-  left: 40px;
-  width: 100px;
-  height: 20px;
-}
-
-.test4 span {
-  top: 0;
-  left: 40px;
-  width: 100px;
-  height: 20px;
-}
-    </style>
-</head>
-<body>
-
-<div class="grid test1"><span>a</span></div>
-
-<div class="grid test2">
-<span class="a">a</span>
-<span class="b">b</span>
-<span class="c">c</span>
-</div>
-
-<div class="grid test3"><span>a</span></div>
-
-<div class="grid test4"><span>a</span></div>
-
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/css-grid/grid-placement-definite-003.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE HTML>
-<html><head>
-    <meta charset="utf-8">
-    <title></title>
-    <style type="text/css">
-html,body {
-  font-size:16px;
-  font-family:monospace;
-}
-.grid {
-  display: grid;
-  border: 1px solid green;
-  grid-template-columns: 20px 20px 20px 20px;
-  grid-template-rows: 20px 20px 20px;
-  grid-auto-flow: row;
-  grid-auto-columns: 20px;
-  grid-auto-rows: 20px;
-}
-
-span {
-  background: lime;
-  border: 1px solid;
-}
-
-.test1 { grid-template-areas:'.. a a-start-.'; }
-.test1 span { grid-column: a-start- / 8; }
-
-.test2 {
-  grid-template-areas:
-    'a a a ... . .'
-    'a a a .   . ..'
-    '.-b b .   . ...'
-  ;
-}
-
-.test2 .a {
-  grid-area: a;
-}
-.test2 .b {
-  grid-column: 2 / span 3;
-  grid-row: b;
-}
-.test2 .c {
-  grid-column: auto / span 3;
-}
-
-.test3 {
-  grid-template-areas:'.a.';
-  grid-template-columns: (a-start) 20px 20px (a-start-start) 20px (a-start-end);
-}
-.test3 span { grid-column: a-start / 8; }
-
-.test4 {
-  grid-template-areas:'. .... .-a';
-  grid-template-columns: 20px (-a-start) 20px (-a-start) 20px (-a-end) 20px ;
-}
-.test4 span { grid-column: -a-start 2 / 8; }
-
-    </style>
-</head>
-<body>
-
-<div class="grid test1"><span>a</span></div>
-
-<div class="grid test2">
-<span class="a">a</span>
-<span class="b">b</span>
-<span class="c">c</span>
-</div>
-
-<div class="grid test3"><span>a</span></div>
-
-<div class="grid test4"><span>a</span></div>
-
-</body>
-</html>
--- a/layout/reftests/css-grid/reftest.list
+++ b/layout/reftests/css-grid/reftest.list
@@ -1,16 +1,15 @@
 default-preferences pref(layout.css.grid.enabled,true)
 
 fails == grid-whitespace-handling-1a.xhtml grid-whitespace-handling-1-ref.xhtml
 fails == grid-whitespace-handling-1b.xhtml grid-whitespace-handling-1-ref.xhtml
 == grid-whitespace-handling-2.xhtml  grid-whitespace-handling-2-ref.xhtml
 == grid-placement-definite-001.html grid-placement-definite-001-ref.html
 == grid-placement-definite-002.html grid-placement-definite-002-ref.html
-== grid-placement-definite-003.html grid-placement-definite-003-ref.html
 == grid-placement-auto-row-sparse-001.html grid-placement-auto-row-sparse-001-ref.html
 == grid-placement-auto-row-dense-001.html grid-placement-auto-row-dense-001-ref.html
 == grid-placement-auto-col-sparse-001.html grid-placement-auto-col-sparse-001-ref.html
 == grid-placement-auto-col-dense-001.html grid-placement-auto-col-dense-001-ref.html
 == grid-track-sizing-001.html grid-track-sizing-001-ref.html
 == grid-abspos-items-001.html grid-abspos-items-001-ref.html
 == grid-abspos-items-002.html grid-abspos-items-002-ref.html
 == grid-order-abspos-items-001.html grid-order-abspos-items-001-ref.html
--- a/layout/style/nsCSSScanner.cpp
+++ b/layout/style/nsCSSScanner.cpp
@@ -1357,20 +1357,16 @@ nsCSSGridTemplateAreaScanner::Next(nsCSS
     uint32_t start = mOffset - 1;  // offset of |ch|
     while (mOffset < mCount && IsOpenCharClass(mBuffer[mOffset], IS_IDCHAR)) {
       mOffset++;
     }
     aTokenResult.mName.Assign(&mBuffer[start], mOffset - start);
     aTokenResult.isTrash = false;
   } else if (ch == '.') {
     // Null cell token
-    // Skip any other '.'
-    while (mOffset < mCount && mBuffer[mOffset] == '.') {
-      mOffset++;
-    }
     aTokenResult.mName.Truncate();
     aTokenResult.isTrash = false;
   } else {
     // Trash token
     aTokenResult.isTrash = true;
   }
   return true;
 }
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -5883,22 +5883,17 @@ if (SpecialPowers.getBoolPref("layout.cs
     inherited: false,
     type: CSS_TYPE_LONGHAND,
     initial_values: [ "none" ],
     other_values: [
       "''",
       "'' ''",
       "'1a-é_ .' \"b .\"",
       "' Z\t\\aZ' 'Z Z'",
-      " '. . a b'  '. .a b' ",
-      "'a.b' '. . .'",
-      "'.' '..'",
-      "'...' '.'",
-      "'...-blah' '. .'",
-      "'.. ..' '.. ...'",
+      " '. . a b'  '..a b' ",
     ],
     invalid_values: [
       "'a b' 'a/b'",
       "'a . a'",
       "'. a a' 'a a a'",
       "'a a .' 'a a a'",
       "'a a' 'a .'",
       "'a a'\n'..'\n'a a'",