Back out 4fd41b93f97c (bug 865654) for mochitest-1 failure

This commit is contained in:
Phil Ringnalda 2013-05-22 21:35:41 -07:00
parent 4d51cd1086
commit dcd6ed49c6
2 changed files with 2 additions and 13 deletions

View File

@ -9390,11 +9390,7 @@ nsIDocument::CaretPositionFromPoint(float aX, float aY)
if (firstChild) { if (firstChild) {
anonNode = firstChild; anonNode = firstChild;
} }
offset = nsContentUtils::GetAdjustedOffsetInTextControl(ptFrame, offset);
if (textArea) {
offset = nsContentUtils::GetAdjustedOffsetInTextControl(ptFrame, offset);
}
node = nonanon; node = nonanon;
} else { } else {
node = nullptr; node = nullptr;

View File

@ -87,11 +87,7 @@
var nullCp4 = document.caretPositionFromPoint(0, 9000); var nullCp4 = document.caretPositionFromPoint(0, 9000);
ok(!nullCp4, "caret position with x > viewport height should be null"); ok(!nullCp4, "caret position with x > viewport height should be null");
// Check a point within the bottom whitespace of the input. // Check the first and last characters of the marquee.
var test5Element = document.getElementById('test5');
var test5Rect = test5Element.getBoundingClientRect();
checkOffsetsFromPoint(test5Rect.left + 5, test5Rect.bottom - 10, 0, 'test5');
SimpleTest.finish(); SimpleTest.finish();
} }
@ -105,8 +101,5 @@
<textarea id="test3">abc</textarea><input id="test4" value="abcdef"><br><br> <textarea id="test3">abc</textarea><input id="test4" value="abcdef"><br><br>
<marquee>marquee</marquee> <marquee>marquee</marquee>
</div> </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> </body>
</html> </html>