Bug 1380393 part 2. Remove nsIDOMHTMLElement.tabIndex. r=mccr8

This commit is contained in:
Boris Zbarsky 2017-07-13 23:45:49 -04:00
Родитель 05bf7c12c0
Коммит 4817516f62
6 изменённых файлов: 7 добавлений и 19 удалений

Просмотреть файл

@ -361,7 +361,7 @@ HTMLObjectElement::IsHTMLFocusable(bool aWithMouse,
nsIDocument *doc = GetComposedDoc();
if (!doc || doc->HasFlag(NODE_IS_EDITABLE)) {
if (aTabIndex) {
GetTabIndex(aTabIndex);
*aTabIndex = TabIndex();
}
*aIsFocusable = false;
@ -377,7 +377,7 @@ HTMLObjectElement::IsHTMLFocusable(bool aWithMouse,
// Has plugin content: let the plugin decide what to do in terms of
// internal focus from mouse clicks
if (aTabIndex) {
GetTabIndex(aTabIndex);
*aTabIndex = TabIndex();
}
*aIsFocusable = true;

Просмотреть файл

@ -224,7 +224,7 @@ HTMLSharedObjectElement::IsHTMLFocusable(bool aWithMouse,
// Has plugin content: let the plugin decide what to do in terms of
// internal focus from mouse clicks
if (aTabIndex) {
GetTabIndex(aTabIndex);
*aTabIndex = TabIndex();
}
*aIsFocusable = true;

Просмотреть файл

@ -306,15 +306,6 @@ public:
*aOffsetHeight = OffsetHeight();
return NS_OK;
}
NS_IMETHOD GetTabIndex(int32_t* aTabIndex) final override {
*aTabIndex = TabIndex();
return NS_OK;
}
NS_IMETHOD SetTabIndex(int32_t aTabIndex) final override {
mozilla::ErrorResult rv;
SetTabIndex(aTabIndex, rv);
return rv.StealNSResult();
}
NS_IMETHOD Focus() final override {
mozilla::ErrorResult rv;
Focus(rv);

Просмотреть файл

@ -22,7 +22,6 @@ interface nsIDOMHTMLMenuElement;
[uuid(b0c42392-d0e7-4f6a-beb5-a698ce648945)]
interface nsIDOMHTMLElement : nsIDOMElement
{
attribute long tabIndex;
void focus();
attribute DOMString accessKey;
readonly attribute boolean draggable;

Просмотреть файл

@ -116,9 +116,8 @@ MakeAnonButton(nsIDocument* aDoc, const char* labelKey,
// Both elements are given the same tab index so that the user can tab
// to the file control at the correct index, and then between the two
// buttons.
int32_t tabIndex;
aInputElement->GetTabIndex(&tabIndex);
buttonElement->SetTabIndex(tabIndex);
IgnoredErrorResult ignored;
buttonElement->SetTabIndex(aInputElement->TabIndex(), ignored);
return button.forget();
}

Просмотреть файл

@ -401,9 +401,8 @@ nsNumberControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
}
// Propogate our tabindex:
int32_t tabIndex;
content->GetTabIndex(&tabIndex);
textField->SetTabIndex(tabIndex);
IgnoredErrorResult ignored;
textField->SetTabIndex(content->TabIndex(), ignored);
// Initialize the text field's placeholder, if ours is set:
nsAutoString placeholder;