Backed out changeset 6e9d3acbb028 (bug 959973) for bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 31 Jan 2014 13:48:25 -0500
changeset 182405 78bbd153072a539d534a2c2c71e34a2afb49eb9c
parent 182404 df918fe43131a2d404309c5171a1b9c09d4310cc
child 182406 35c57af24bf5e00d401ed2699379ad606e6ef6df
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs959973
milestone29.0a1
backs out6e9d3acbb02806779e4686b25572b89aeac872ae
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 6e9d3acbb028 (bug 959973) for bustage.
layout/reftests/w3c-css/submitted/variables/reftest.list
layout/reftests/w3c-css/submitted/variables/support/external-variable-declaration.css
layout/reftests/w3c-css/submitted/variables/support/external-variable-font-face.css
layout/reftests/w3c-css/submitted/variables/support/external-variable-reference.css
layout/reftests/w3c-css/submitted/variables/support/external-variable-supports.css
layout/reftests/w3c-css/submitted/variables/variable-external-declaration-01.html
layout/reftests/w3c-css/submitted/variables/variable-external-font-face-01.html
layout/reftests/w3c-css/submitted/variables/variable-external-reference-01.html
layout/reftests/w3c-css/submitted/variables/variable-external-supports-01.html
layout/style/test/Makefile.in
layout/style/test/test_variables.html
--- a/layout/reftests/w3c-css/submitted/variables/reftest.list
+++ b/layout/reftests/w3c-css/submitted/variables/reftest.list
@@ -54,20 +54,16 @@ default-preferences pref(layout.css.vari
 == variable-declaration-53.html support/color-green-ref.html
 == variable-declaration-54.html support/color-green-ref.html
 == variable-declaration-55.html support/color-green-ref.html
 == variable-declaration-56.html support/color-green-ref.html
 == variable-declaration-57.html support/color-green-ref.html
 == variable-declaration-58.html support/color-green-ref.html
 == variable-declaration-59.html support/color-green-ref.html
 == variable-declaration-60.html support/color-green-ref.html
-== variable-external-declaration-01.html support/color-green-ref.html
-== variable-external-font-face-01.html variable-font-face-01-ref.html
-== variable-external-reference-01.html support/color-green-ref.html
-== variable-external-supports-01.html support/color-green-ref.html
 == variable-font-face-01.html variable-font-face-01-ref.html
 == variable-font-face-02.html variable-font-face-02-ref.html
 == variable-reference-01.html support/color-green-ref.html
 == variable-reference-02.html support/color-green-ref.html
 == variable-reference-03.html support/color-green-ref.html
 == variable-reference-04.html support/color-green-ref.html
 == variable-reference-05.html support/color-green-ref.html
 == variable-reference-06.html support/color-green-ref.html
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/variables/support/external-variable-declaration.css
+++ /dev/null
@@ -1,5 +0,0 @@
-p {
-  color: red;
-  var-a: green;
-  color: var(a);
-}
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/variables/support/external-variable-font-face.css
+++ /dev/null
@@ -1,15 +0,0 @@
-@font-face {
-  var-a: MyTestFontName;
-  font-family: var(a);
-  src: url(../../../../fonts/Ahem.ttf);
-}
-@font-face {
-  font-family: MyTestFontName2;
-  src: url(../../../../fonts/Ahem.ttf);
-}
-#a {
-  font-family: MyTestFontName;
-}
-#b {
-  font-family: MyTestFontName2;
-}
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/variables/support/external-variable-reference.css
+++ /dev/null
@@ -1,6 +0,0 @@
-:root {
-  var-a: green;
-}
-p {
-  color: var(a);
-}
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/variables/support/external-variable-supports.css
+++ /dev/null
@@ -1,4 +0,0 @@
-body { color: red; }
-@supports (color:var(a)) {
-  p { color: green; }
-}
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/variables/variable-external-declaration-01.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<!DOCTYPE html>
-<title>CSS Test: Test declaring a variable in an external CSS file.</title>
-<link rel="author" title="Mihaela Velimiroviciu" href="mailto:mihaela.velimiroviciu@softvisioninc.eu">
-<link rel="help" href="http://www.w3.org/TR/css-variables-1/#syntax">
-<link rel="match" href="support/color-green-ref.html">
-<link rel="stylesheet" type="text/css" href="support/external-variable-declaration.css">
-
-<p>This text must be green.</p>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/variables/variable-external-font-face-01.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<!DOCTYPE html>
-<title>CSS Test: Test the invalid declaration and use of a variable in an @font-face rule within an external CSS.</title>
-<link rel="author" title="Mihaela Velimiroviciu" href="mailto:mihaela.velimiroviciu@softvisioninc.eu">
-<link rel="help" href="http://www.w3.org/TR/css-variables-1/#defining-variables">
-<link rel="match" href="variable-font-face-01-ref.html">
-<link rel="stylesheet" type="text/css" href="support/external-variable-font-face.css">
-<meta name="flags" content="ahem">
-<p id=a>This text must not be in Ahem.</p>
-<p id=b>But this text must be in Ahem.</p>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/variables/variable-external-reference-01.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<!DOCTYPE html>
-<title>CSS Test: Test the use of a variable in a non-custom property where the variable value is inherited within an external CSS.</title>
-<link rel="author" title="Mihaela Velimiroviciu" href="mailto:mihaela.velimiroviciu@softvisioninc.eu">
-<link rel="help" href="http://www.w3.org/TR/css-variables-1/#using-variables">
-<link rel="stylesheet" type="text/css" href="support/external-variable-reference.css">
-<link rel="match" href="support/color-green-ref.html">
-
-<p>This text must be green.</p>
deleted file mode 100644
--- a/layout/reftests/w3c-css/submitted/variables/variable-external-supports-01.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<!DOCTYPE html>
-<title>CSS Test: Test a passing non-custom property declaration in an @supports rule where the property value contains a variable reference within an external stylesheet file.</title>
-<link rel="author" title="Mihaela Velimiroviciu" href="mailto:mihaela.velimiroviciu@softvisioninc.eu">
-<link rel="help" href="http://www.w3.org/TR/css-variables-1/#using-variables">
-<link rel="stylesheet" type="text/css" href="support/external-variable-supports.css">
-<link rel="match" href="support/color-green-ref.html">
-
-<p>This text must be green.</p>
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -24,17 +24,16 @@ VISITED_REFTEST_FILES = \
 		$(NULL)
 VISITED_REFTEST_DEST = $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)/css-visited/
 INSTALL_TARGETS += VISITED_REFTEST
 
 ifdef COMPILE_ENVIRONMENT
 MOCHITEST_FILES += \
 		test_property_database.html \
 		css_properties.js \
-		support/external-variable-url.css \
 		$(NULL)
 
 css_properties.js: host_ListCSSProperties$(HOST_BIN_SUFFIX) css_properties_like_longhand.js Makefile
 	$(RM) $@
 	./host_ListCSSProperties$(HOST_BIN_SUFFIX) > $@
 	cat $(srcdir)/css_properties_like_longhand.js >> $@
 
 GARBAGE += css_properties.js
--- a/layout/style/test/test_variables.html
+++ b/layout/style/test/test_variables.html
@@ -1,29 +1,26 @@
 <!DOCTYPE type>
 <title>Assorted CSS variable tests</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css" type="text/css">
-<link rel="stylesheet" href="external-variable-url.css" type="text/css">
 
 <style id="test1">
 p { var-a:123!important; }
 </style>
 
 <style id="test2">
 p { var-a: a !important; }
 </style>
 
 <style id="test3">
 p { border-left-style: inset; padding: 1px; var-decoration: line-through; }
 </style>
 
-<div id="t4"></div>
-
 <script>
 var tests = [
   function() {
     // https://bugzilla.mozilla.org/show_bug.cgi?id=773296#c121
     var declaration = document.getElementById("test1").sheet.cssRules[0].style;
     declaration.cssText;
     declaration.setProperty("color", "black");
     is(declaration.getPropertyValue("var-a"), "123");
@@ -35,22 +32,12 @@ var tests = [
     is(declaration.getPropertyPriority("var-a"), "important");
   },
 
   function() {
     // https://bugzilla.mozilla.org/show_bug.cgi?id=955913
     var declaration = document.getElementById("test3").sheet.cssRules[0].style;
     is(declaration[declaration.length - 1], "var-decoration");
   },
-
-  function() {
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=959973
-    var element = document.getElementById("t4");
-    var path = window.location.pathname;
-    var currentDir = path.substring(0, path.lastIndexOf('/'));
-    var imageURL = "http://mochi.test:8888" + currentDir + "/image.png";
-
-    is(window.getComputedStyle(element).getPropertyValue("background-image"), "url(\"" + imageURL +"\")");
-  },
 ];
 
 tests.forEach(function(fn) { fn(); });
 </script>