From c5660755f743336a1b80f4b1eb08d5232ab022fc Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 6 May 2014 21:21:20 -0400
Subject: [PATCH] Bug 650586 - test_flush_on_paint.html needs to be explicit
 about its setTimeout requirements; r=roc

---
 layout/base/tests/test_flush_on_paint.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/layout/base/tests/test_flush_on_paint.html b/layout/base/tests/test_flush_on_paint.html
index 2a2d14beae1d..de088b4de877 100644
--- a/layout/base/tests/test_flush_on_paint.html
+++ b/layout/base/tests/test_flush_on_paint.html
@@ -13,6 +13,9 @@
 <pre id="test">
 <script type="application/javascript">
 SimpleTest.waitForExplicitFinish();
+SimpleTest.requestFlakyTimeout("This test deals with painting and invalidation. " +
+                               "Those are tricky to detect, so we have to poll here, which means that we have to rely on flaky timeouts. " +
+                               "This special case is safe because we're only polling for events.");
 
 var iterations = 0;
 var plugin = document.getElementById("plugin");