From ed348e9d4f9adace987bac36596de4e43e9cad64 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Fri, 8 Jan 2016 14:11:02 -0500
Subject: [PATCH] Avoid intermittent failures in
 mime_sniffing_font_context.html. Fixes #9124.

---
 .../meta/mozilla/mime_sniffing_font_context.html.ini        | 1 -
 .../mozilla/tests/mozilla/mime_sniffing_font_context.html   | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/wpt/mozilla/meta/mozilla/mime_sniffing_font_context.html.ini b/tests/wpt/mozilla/meta/mozilla/mime_sniffing_font_context.html.ini
index 5727ab12dd7..92e5aeb2640 100644
--- a/tests/wpt/mozilla/meta/mozilla/mime_sniffing_font_context.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/mime_sniffing_font_context.html.ini
@@ -1,3 +1,2 @@
 [mime_sniffing_font_context.html]
   prefs: ['net.mime.sniff:true']
-  disabled: https://github.com/servo/servo/issues/9124
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 ab0bc5d81c8..8112a99f431 100644
--- a/tests/wpt/mozilla/tests/mozilla/mime_sniffing_font_context.html
+++ b/tests/wpt/mozilla/tests/mozilla/mime_sniffing_font_context.html
@@ -70,6 +70,12 @@ async_test(function() {
 function checkFontLoaded() {
     var first = document.getElementById('first');
     var second = document.getElementById('second');
+    // Since there's no way to be notified when the page has been marked dirty in response
+    // to a font having loaded, we'll just keep trying.
+    if (first.getBoundingClientRect().width == second.getBoundingClientRect().width) {
+        this.step_timeout(checkFontLoaded, 500);
+        return;
+    }
     assert_not_equals(first.getBoundingClientRect().width, second.getBoundingClientRect().width);
     assert_not_equals(first.getBoundingClientRect().height, second.getBoundingClientRect().height);
     this.done();