summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-20 14:01:05 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-20 14:01:05 +0100
commit4c697043da9fe3f58a7e070dad74eab6972695a0 (patch)
tree8570f17500f94cc5c4275517b7c4d1958ca813e6
parentfd9d8c20d21f527d99bf9ce3d3f0f25f85fb029c (diff)
downloadUXP-4c697043da9fe3f58a7e070dad74eab6972695a0.tar
UXP-4c697043da9fe3f58a7e070dad74eab6972695a0.tar.gz
UXP-4c697043da9fe3f58a7e070dad74eab6972695a0.tar.lz
UXP-4c697043da9fe3f58a7e070dad74eab6972695a0.tar.xz
UXP-4c697043da9fe3f58a7e070dad74eab6972695a0.zip
Remove windows-xp and windows-vista from @media(-moz-os-version)
-rw-r--r--browser/components/webextensions/extension-win-panel.css4
-rw-r--r--layout/style/nsMediaFeatures.cpp2
-rw-r--r--layout/style/test/chrome/bug418986-2.js2
-rw-r--r--layout/style/test/test_media_queries.html2
-rw-r--r--widget/LookAndFeel.h5
5 files changed, 2 insertions, 13 deletions
diff --git a/browser/components/webextensions/extension-win-panel.css b/browser/components/webextensions/extension-win-panel.css
index ddafe3ea5..9da6da14c 100644
--- a/browser/components/webextensions/extension-win-panel.css
+++ b/browser/components/webextensions/extension-win-panel.css
@@ -1,6 +1,4 @@
-@media (-moz-os-version: windows-xp),
- (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
+@media (-moz-os-version: windows-win7) {
body {
border-radius: 4px;
}
diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp
index 052ce58e8..5a54d5455 100644
--- a/layout/style/nsMediaFeatures.cpp
+++ b/layout/style/nsMediaFeatures.cpp
@@ -70,8 +70,6 @@ struct OperatingSystemVersionInfo {
// Os version identities used in the -moz-os-version media query.
const OperatingSystemVersionInfo osVersionStrings[] = {
- { LookAndFeel::eOperatingSystemVersion_WindowsXP, L"windows-xp" },
- { LookAndFeel::eOperatingSystemVersion_WindowsVista, L"windows-vista" },
{ LookAndFeel::eOperatingSystemVersion_Windows7, L"windows-win7" },
{ LookAndFeel::eOperatingSystemVersion_Windows8, L"windows-win8" },
{ LookAndFeel::eOperatingSystemVersion_Windows10, L"windows-win10" }
diff --git a/layout/style/test/chrome/bug418986-2.js b/layout/style/test/chrome/bug418986-2.js
index 4336f4abd..b083f48ee 100644
--- a/layout/style/test/chrome/bug418986-2.js
+++ b/layout/style/test/chrome/bug418986-2.js
@@ -53,8 +53,6 @@ var suppressed_toggles = [
// Possible values for '-moz-os-version'
var windows_versions = [
- "windows-xp",
- "windows-vista",
"windows-win7",
"windows-win8",
"windows-win10",
diff --git a/layout/style/test/test_media_queries.html b/layout/style/test/test_media_queries.html
index 479306a55..d503fad0b 100644
--- a/layout/style/test/test_media_queries.html
+++ b/layout/style/test/test_media_queries.html
@@ -713,8 +713,6 @@ function run() {
expression_should_not_be_parseable("-moz-windows-theme: ");
// os version media queries (currently windows only)
- expression_should_be_parseable("-moz-os-version: windows-xp");
- expression_should_be_parseable("-moz-os-version: windows-vista");
expression_should_be_parseable("-moz-os-version: windows-win7");
expression_should_be_parseable("-moz-os-version: windows-win8");
expression_should_be_parseable("-moz-os-version: windows-win10");
diff --git a/widget/LookAndFeel.h b/widget/LookAndFeel.h
index 443852330..cf84b3308 100644
--- a/widget/LookAndFeel.h
+++ b/widget/LookAndFeel.h
@@ -440,10 +440,7 @@ public:
* Operating system versions.
*/
enum OperatingSystemVersion {
- // XXX: The XP and Vista values can now be removed (see bug 1330146).
- eOperatingSystemVersion_WindowsXP = 0,
- eOperatingSystemVersion_WindowsVista,
- eOperatingSystemVersion_Windows7,
+ eOperatingSystemVersion_Windows7 = 2,
eOperatingSystemVersion_Windows8,
eOperatingSystemVersion_Windows10,
eOperatingSystemVersion_Unknown