Update app_units to 0.3.1

The height test is removed in mime_sniffing_font_context because of rounding
changes in app_units. The rest of that test is still useful though, given it
will timeout if the font fails to be sniffed.

12 files changed, 31 insertions, 33 deletions

diff --git a/Cargo.lock b/Cargo.lock
index de3c8529c3a..3843b9538fe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -53,7 +53,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "app_units"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -924,7 +924,7 @@ dependencies = [
 name = "geckoservo"
 version = "0.0.1"
 dependencies = [
- "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -950,7 +950,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "gfx"
 version = "0.0.1"
 dependencies = [
- "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1331,7 +1331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "layout"
 version = "0.0.1"
 dependencies = [
- "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "canvas_traits 0.0.1",
@@ -1381,7 +1381,7 @@ dependencies = [
 name = "layout_thread"
 version = "0.0.1"
 dependencies = [
- "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
@@ -2244,7 +2244,7 @@ name = "script"
 version = "0.0.1"
 dependencies = [
  "angle 0.1.2 (git+https://github.com/servo/angle?branch=servo)",
- "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "audio-video-metadata 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2318,7 +2318,7 @@ dependencies = [
 name = "script_layout_interface"
 version = "0.0.1"
 dependencies = [
- "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "canvas_traits 0.0.1",
  "cssparser 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2356,7 +2356,7 @@ dependencies = [
 name = "script_traits"
 version = "0.0.1"
 dependencies = [
- "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bluetooth_traits 0.0.1",
  "canvas_traits 0.0.1",
  "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2598,7 +2598,7 @@ dependencies = [
 name = "servo_geometry"
 version = "0.0.1"
 dependencies = [
- "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2737,7 +2737,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "style"
 version = "0.0.1"
 dependencies = [
- "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bindgen 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2783,7 +2783,7 @@ dependencies = [
 name = "style_tests"
 version = "0.0.1"
 dependencies = [
- "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "html5ever-atoms 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2804,7 +2804,7 @@ dependencies = [
 name = "style_traits"
 version = "0.0.1"
 dependencies = [
- "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2818,7 +2818,7 @@ dependencies = [
 name = "stylo_tests"
 version = "0.0.1"
 dependencies = [
- "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3178,7 +3178,7 @@ name = "webrender"
 version = "0.15.0"
 source = "git+https://github.com/servo/webrender#512b4a1433a7827ef7cfd121d2f99fdd91ecf80e"
 dependencies = [
- "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3205,7 +3205,7 @@ name = "webrender_traits"
 version = "0.14.0"
 source = "git+https://github.com/servo/webrender#512b4a1433a7827ef7cfd121d2f99fdd91ecf80e"
 dependencies = [
- "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "dwrote 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3339,7 +3339,7 @@ dependencies = [
 "checksum android_injected_glue 0.2.1 (git+https://github.com/mmatyas/android-rs-injected-glue)" = "<none>"
 "checksum angle 0.1.2 (git+https://github.com/servo/angle?branch=servo)" = "<none>"
 "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
-"checksum app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "636ee56f12e31dbc11dc0a1ac6004f08b04e6e6595963716fc8130e90d4e04cf"
+"checksum app_units 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eee1c5121e7d126275a909d7de53456ba9adae2f4b2f40b8b395cac4502c2602"
 "checksum arrayvec 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d89f1b0e242270b5b797778af0c8d182a1a2ccac5d8d6fadf414223cc0fab096"
 "checksum aster 0.38.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2c9b49e42a449c0b79d8acb91db37621de0978064dca7d3288ddcf030123e5b3"
 "checksum atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb2dcb6e6d35f20276943cc04bb98e538b348d525a04ac79c10021561d202f21"
diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-repeat-x.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-repeat-x.htm.ini
index 4f828f8bab8..c06bdccbb3c 100644
--- a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-repeat-x.htm.ini
+++ b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-repeat-x.htm.ini
@@ -1,4 +1,3 @@
 [background-repeat-repeat-x.htm]
   type: reftest
-  expected:
-    if os == "mac": FAIL
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-repeat-y.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-repeat-y.htm.ini
index 354350d036e..ed4668c8acc 100644
--- a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-repeat-y.htm.ini
+++ b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-repeat-y.htm.ini
@@ -1,4 +1,3 @@
 [background-repeat-repeat-y.htm]
   type: reftest
-  expected:
-    if os == "mac": FAIL
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_direction-row-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_direction-row-reverse.htm.ini
deleted file mode 100644
index 4b0333dd2cf..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_direction-row-reverse.htm.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_direction-row-reverse.htm]
-  type: reftest
-  expected:
-    if os == "mac": FAIL
diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-017.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-017.htm.ini
index 1c921a68c69..11708836af0 100644
--- a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-017.htm.ini
+++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-017.htm.ini
@@ -1,3 +1,4 @@
 [transform-input-017.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini
index 23299ad9e96..2838a64d8f4 100644
--- a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini
+++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini
@@ -1,3 +1,4 @@
 [transform-input-018.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-x.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-x.htm.ini
index 4f828f8bab8..c06bdccbb3c 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-x.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-x.htm.ini
@@ -1,4 +1,3 @@
 [background-repeat-repeat-x.htm]
   type: reftest
-  expected:
-    if os == "mac": FAIL
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-y.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-y.htm.ini
index 354350d036e..ed4668c8acc 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-y.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-y.htm.ini
@@ -1,4 +1,3 @@
 [background-repeat-repeat-y.htm]
   type: reftest
-  expected:
-    if os == "mac": FAIL
+  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/c5525-fltwidth-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c5525-fltwidth-003.htm.ini
new file mode 100644
index 00000000000..f1e5b2f41ee
--- /dev/null
+++ b/tests/wpt/metadata-css/css21_dev/html4/c5525-fltwidth-003.htm.ini
@@ -0,0 +1,4 @@
+[c5525-fltwidth-003.htm]
+  type: reftest
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/floats-028.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-028.htm.ini
index 9f983b23edc..5f07b8a762e 100644
--- a/tests/wpt/metadata-css/css21_dev/html4/floats-028.htm.ini
+++ b/tests/wpt/metadata-css/css21_dev/html4/floats-028.htm.ini
@@ -1,3 +1,4 @@
 [floats-028.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "mac": FAIL
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 625ba20f9c8..53a25555f38 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -25673,7 +25673,7 @@
    "testharness"
   ],
   "mozilla/mime_sniffing_font_context.html": [
-   "cd2c1b14ce7b1810f4b75148e0fa9abbfceb780d",
+   "1311e72e0a0dafa6fae594ca1ce2deca164acd36",
    "testharness"
   ],
   "mozilla/mozbrowser/crossorigin_xhr.html": [
diff --git a/tests/wpt/mozilla/tests/mozilla/mime_sniffing_font_context.html b/tests/wpt/mozilla/tests/mozilla/mime_sniffing_font_context.html
index 2182b7fcbd8..3d8a4d17059 100644
--- a/tests/wpt/mozilla/tests/mozilla/mime_sniffing_font_context.html
+++ b/tests/wpt/mozilla/tests/mozilla/mime_sniffing_font_context.html
@@ -77,7 +77,6 @@ function checkFontLoaded() {
         return;
     }
     assert_not_equals(first.getBoundingClientRect().width, second.getBoundingClientRect().width);
-    assert_not_equals(first.getBoundingClientRect().height, second.getBoundingClientRect().height);
     this.done();
 }