corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1433566 part 12. Stop using nsIDOMText in layout. r=mystor

Browse Source 
MozReview-Commit-ID: KliYtj5U8jK
This commit is contained in:
Boris Zbarsky
2018-03-19 15:15:39 -04:00
parent 1cc6713256
commit ad41948e4a
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
layout/forms/nsTextControlFrame.cpp
View File

@@ -32,7 +32,6 @@
#include "nsINode.h"
#include "nsPIDOMWindow.h" //needed for notify selection changed to update the menus ect.
#include "nsIDOMText.h" //for multiline getselection
#include "nsFocusManager.h"
#include "nsPresState.h"
#include "nsAttrValueInlines.h"
@@ -45,6 +44,7 @@
#include "mozilla/dom/HTMLInputElement.h"
#include "mozilla/dom/HTMLTextAreaElement.h"
#include "mozilla/dom/ScriptSettings.h"
#include "mozilla/dom/Text.h"
#include "mozilla/MathAlgorithms.h"
#include "nsFrameSelection.h"
@@ -1049,26 +1049,25 @@ nsTextControlFrame::OffsetToDOMPoint(uint32_t aOffset,
NS_ASSERTION(length <= 2, "We should have one text node and one mozBR at most");
nsCOMPtr<nsINode> firstNode = nodeList->Item(0);
nsCOMPtr<nsIDOMText> textNode = do_QueryInterface(firstNode);
Text* textNode = firstNode ? firstNode->GetAsText() : nullptr;
if (length == 0) {
NS_IF_ADDREF(*aResult = rootNode);
*aPosition = 0;
} else if (textNode) {
uint32_t textLength = 0;
textNode->GetLength(&textLength);
uint32_t textLength = textNode->Length();
if (length == 2 && aOffset == textLength) {
// If we're at the end of the text node and we have a trailing BR node,
// set the selection on the BR node.
NS_IF_ADDREF(*aResult = rootNode);
rootNode.forget(aResult);
*aPosition = 1;
} else {
// Otherwise, set the selection on the textnode itself.
NS_IF_ADDREF(*aResult = firstNode);
firstNode.forget(aResult);
*aPosition = std::min(aOffset, textLength);
}
} else {
NS_IF_ADDREF(*aResult = rootNode);
rootNode.forget(aResult);
*aPosition = 0;
}