From 8307cab9c4273f7817e4eaffcd0e551179717ea6 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 21 Jan 2014 14:33:57 -0500
Subject: [PATCH] Backed out changeset 0e34a26a4353 (bug 924972) because of
 more test failures

---
 layout/base/tests/bug682712-1-ref.html          | 1 -
 layout/base/tests/test_reftests_with_caret.html | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/layout/base/tests/bug682712-1-ref.html b/layout/base/tests/bug682712-1-ref.html
index 7dcfa99440a8..70cd7a1da714 100644
--- a/layout/base/tests/bug682712-1-ref.html
+++ b/layout/base/tests/bug682712-1-ref.html
@@ -12,7 +12,6 @@
         var doc = iframe.contentDocument;
 
         setTimeout(function() {
-          doc.body.scrollIntoView();
           synthesizeMouse(iframe, 10, 10, {});
 
           // Now try to set the caret without moving it
diff --git a/layout/base/tests/test_reftests_with_caret.html b/layout/base/tests/test_reftests_with_caret.html
index 66a625fc1303..87fda4d1c4a5 100644
--- a/layout/base/tests/test_reftests_with_caret.html
+++ b/layout/base/tests/test_reftests_with_caret.html
@@ -39,7 +39,7 @@ function callbackTestCanvas(canvas)
     reference.parentNode.removeChild(reference);
   }
   canvases = [];
-  SimpleTest.waitForFocus(nextTest);
+  nextTest();
 }
 
 function doSnapShot(iframe) {