From f623d605104288fc76f22f90814792f54d6b3e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Wed, 9 Aug 2017 22:05:22 +0200
Subject: [PATCH] Bug 1386964 - Set default tab height and mark flaky
 viewport-units-css2-001.html subtests as passing on Linux. r=dholbert

MozReview-Commit-ID: 5gLgepyDiaW

--HG--
extra : rebase_source : dacd6ced6843e8c819733b05a95eafab853873a9
---
 browser/themes/shared/tabs.inc.css                          | 2 --
 .../meta/css/css-values-3/viewport-units-css2-001.html.ini  | 6 ++++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index 2dc39d514952..c26c806f5ef8 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -6,12 +6,10 @@
 
 :root {
   --tab-toolbar-navbar-overlap: 1px;
-/* Temporarily using the compact tab strip by default because of bug 1386964:
   --tab-min-height: 33px;
 }
 
 :root[uidensity=compact] {
-*/
   --tab-min-height: 29px;
 }
 
diff --git a/testing/web-platform/meta/css/css-values-3/viewport-units-css2-001.html.ini b/testing/web-platform/meta/css/css-values-3/viewport-units-css2-001.html.ini
index eed6261f7ab0..5f8aad9ff46c 100644
--- a/testing/web-platform/meta/css/css-values-3/viewport-units-css2-001.html.ini
+++ b/testing/web-platform/meta/css/css-values-3/viewport-units-css2-001.html.ini
@@ -7,10 +7,12 @@
       if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
 
   [vh length applied to border-top-width]
-    expected: FAIL
+    expected:
+      if os != "linux": FAIL
 
   [vmin length applied to border-top-width]
-    expected: FAIL
+    expected:
+      if os != "linux": FAIL
 
   [vmax length applied to border-top-width]
     expected: