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

Bug 1611713 - Remove TextControlState::GetParentNumberControl. r=masayuki

Browse Source 
Can't return anything useful anymore since bug 981248.

Differential Revision: https://phabricator.services.mozilla.com/D61091
This commit is contained in:
Emilio Cobos Álvarez
2020-01-27 00:00:09 +00:00
parent 264d0cc5a5
commit e76e7aa50a
4 changed files with 5 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
dom/html/TextControlState.cpp
View File

@@ -1949,8 +1949,7 @@ nsresult TextControlState::PrepareEditor(const nsAString* aValue) {
}
// Restore our selection after being bound to a new frame
HTMLInputElement* number = GetParentNumberControl(mBoundFrame);
if (number ? number->IsSelectionCached() : mSelectionCached) {
if (mSelectionCached) {
if (mRestoringSelection) { // paranoia
mRestoringSelection->Revoke();
}
@@ -1967,11 +1966,7 @@ nsresult TextControlState::PrepareEditor(const nsAString* aValue) {
// happens before our RestoreSelectionState runs, it looks like we'll lose our
// selection info, because we will think we don't have it cached and try to
// read it from the selection controller, which will not have it yet.
if (number) {
number->ClearSelectionCached();
} else {
mSelectionCached = false;
}
mSelectionCached = false;
return preparingEditor.IsTextControlStateDestroyed()
? NS_ERROR_NOT_INITIALIZED
@@ -1982,27 +1977,6 @@ void TextControlState::FinishedRestoringSelection() {
mRestoringSelection = nullptr;
}
bool TextControlState::IsSelectionCached() const {
if (mBoundFrame) {
HTMLInputElement* number = GetParentNumberControl(mBoundFrame);
if (number) {
return number->IsSelectionCached();
}
}
return mSelectionCached;
}
TextControlState::SelectionProperties&
TextControlState::GetSelectionProperties() {
if (mBoundFrame) {
HTMLInputElement* number = GetParentNumberControl(mBoundFrame);
if (number) {
return number->GetSelectionProperties();
}
}
return mSelectionProperties;
}
void TextControlState::SyncUpSelectionPropertiesBeforeDestruction() {
if (mBoundFrame) {
UnbindFromFrame(mBoundFrame);
@@ -2370,31 +2344,6 @@ void TextControlState::SetRangeText(const nsAString& aReplacement,
// The instance may have already been deleted here.
}
HTMLInputElement* TextControlState::GetParentNumberControl(
nsFrame* aFrame) const {
MOZ_ASSERT(aFrame);
nsIContent* content = aFrame->GetContent();
MOZ_ASSERT(content);
nsIContent* parent = content->GetParent();
if (!parent) {
return nullptr;
}
nsIContent* parentOfParent = parent->GetParent();
if (!parentOfParent) {
return nullptr;
}
HTMLInputElement* input = HTMLInputElement::FromNode(parentOfParent);
if (!input) {
return nullptr;
}
// This function might be called during frame reconstruction as a result
// of changing the input control's type from number to something else. In
// that situation, the type of the control has changed, but its frame has
// not been reconstructed yet. So we need to check the type of the input
// control in addition to the type of the frame.
return (input->ControlType() == NS_FORM_INPUT_NUMBER) ? input : nullptr;
}
void TextControlState::DestroyEditor() {
// notify the editor that we are going away
if (mEditorInitialized) {
@@ -2449,15 +2398,7 @@ void TextControlState::UnbindFromFrame(nsTextControlFrame* aFrame) {
props.SetStart(start);
props.SetEnd(end);
props.SetDirection(direction);
HTMLInputElement* number = GetParentNumberControl(aFrame);
if (number) {
// If we are inside a number control, cache the selection on the
// parent control, because this text editor state will be destroyed
// together with the native anonymous text control.
number->SetSelectionCached();
} else {
mSelectionCached = true;
}
mSelectionCached = true;
}
// Destroy our editor