Bug 1293570 - Revert parts of bug 1003741 which were added to make selection APIs work on <input type=number>; r=baku

In particular we keep the frame a form control frame so that it gets the
correct CSS box sizing by the layout code.
This commit is contained in:
Ehsan Akhgari
2016-08-10 14:29:00 -04:00
parent 6af078de24
commit c8d154be84
7 changed files with 55 additions and 155 deletions

View File

@@ -46,7 +46,6 @@ NS_IMPL_FRAMEARENA_HELPERS(nsNumberControlFrame)
NS_QUERYFRAME_HEAD(nsNumberControlFrame)
NS_QUERYFRAME_ENTRY(nsNumberControlFrame)
NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator)
NS_QUERYFRAME_ENTRY(nsITextControlFrame)
NS_QUERYFRAME_ENTRY(nsIFormControlFrame)
NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame)
@@ -473,72 +472,6 @@ nsNumberControlFrame::GetType() const
return nsGkAtoms::numberControlFrame;
}
NS_IMETHODIMP
nsNumberControlFrame::GetEditor(nsIEditor **aEditor)
{
return GetTextFieldFrame()->GetEditor(aEditor);
}
NS_IMETHODIMP
nsNumberControlFrame::SetSelectionStart(int32_t aSelectionStart)
{
return GetTextFieldFrame()->SetSelectionStart(aSelectionStart);
}
NS_IMETHODIMP
nsNumberControlFrame::SetSelectionEnd(int32_t aSelectionEnd)
{
return GetTextFieldFrame()->SetSelectionEnd(aSelectionEnd);
}
NS_IMETHODIMP
nsNumberControlFrame::SetSelectionRange(int32_t aSelectionStart,
int32_t aSelectionEnd,
SelectionDirection aDirection)
{
return GetTextFieldFrame()->SetSelectionRange(aSelectionStart, aSelectionEnd,
aDirection);
}
NS_IMETHODIMP
nsNumberControlFrame::GetSelectionRange(int32_t* aSelectionStart,
int32_t* aSelectionEnd,
SelectionDirection* aDirection)
{
return GetTextFieldFrame()->GetSelectionRange(aSelectionStart, aSelectionEnd,
aDirection);
}
NS_IMETHODIMP
nsNumberControlFrame::GetOwnedSelectionController(nsISelectionController** aSelCon)
{
return GetTextFieldFrame()->GetOwnedSelectionController(aSelCon);
}
nsFrameSelection*
nsNumberControlFrame::GetOwnedFrameSelection()
{
return GetTextFieldFrame()->GetOwnedFrameSelection();
}
nsresult
nsNumberControlFrame::GetPhonetic(nsAString& aPhonetic)
{
return GetTextFieldFrame()->GetPhonetic(aPhonetic);
}
nsresult
nsNumberControlFrame::EnsureEditorInitialized()
{
return GetTextFieldFrame()->EnsureEditorInitialized();
}
nsresult
nsNumberControlFrame::ScrollSelectionIntoView()
{
return GetTextFieldFrame()->ScrollSelectionIntoView();
}
void
nsNumberControlFrame::SetFocus(bool aOn, bool aRepaint)
{