From dcd6ed49c62731765fd2111cc914a29e5e61db31 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Wed, 22 May 2013 21:35:41 -0700
Subject: [PATCH] Back out 4fd41b93f97c (bug 865654) for mochitest-1 failure

---
 content/base/src/nsDocument.cpp                    | 6 +-----
 content/base/test/test_caretPositionFromPoint.html | 9 +--------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 92393c58cdd..c1b852a1cde 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -9390,11 +9390,7 @@ nsIDocument::CaretPositionFromPoint(float aX, float aY)
       if (firstChild) {
         anonNode = firstChild;
       }
-
-      if (textArea) {
-        offset = nsContentUtils::GetAdjustedOffsetInTextControl(ptFrame, offset);
-      }
-
+      offset = nsContentUtils::GetAdjustedOffsetInTextControl(ptFrame, offset);
       node = nonanon;
     } else {
       node = nullptr;
diff --git a/content/base/test/test_caretPositionFromPoint.html b/content/base/test/test_caretPositionFromPoint.html
index 905a65059db..877dff0624f 100644
--- a/content/base/test/test_caretPositionFromPoint.html
+++ b/content/base/test/test_caretPositionFromPoint.html
@@ -87,11 +87,7 @@
     var nullCp4 = document.caretPositionFromPoint(0, 9000);
     ok(!nullCp4, "caret position with x > viewport height should be null");
 
-    // Check a point within the bottom whitespace of the input.
-    var test5Element = document.getElementById('test5');
-    var test5Rect = test5Element.getBoundingClientRect();
-    checkOffsetsFromPoint(test5Rect.left + 5, test5Rect.bottom - 10, 0, 'test5');
-
+    // Check the first and last characters of the marquee.
     SimpleTest.finish();
   }
 
@@ -105,8 +101,5 @@
 <textarea id="test3">abc</textarea><input id="test4" value="abcdef"><br><br>
 <marquee>marquee</marquee>
 </div>
-<center>
-<input style="height: 400px;" id="test5" style="width:300px; height:25px;" value="The rabbit-hole went straight on like a tunnel for some way, and then dipped suddenly down, so suddenly that Alice had not a moment to think about stopping herself before she found herself falling down a very deep well. Either the well was very deep, or she fell very slowly, for she had plenty of time as she went down to look about her and to wonder what was going to happen next. First, she tried to look down and make out what she was coming to, but it was too dark to see anything; then she looked at the sides of the well, and noticed that they were filled with cupboards and book-shelves; here and there she saw maps and pictures hung upon pegs. She took down a jar from one of the shelves as she passed; it was labelled `ORANGE MARMALADE', but to her great disappointment it was empty: she did not like to drop the jar for fear of killing somebody, so managed to put it into one of the cupboards as she fell past it." type="text">
-</center>
 </body>
 </html>