diff options
Diffstat (limited to 'dom/html/HTMLButtonElement.cpp')
| -rw-r--r-- | dom/html/HTMLButtonElement.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/dom/html/HTMLButtonElement.cpp b/dom/html/HTMLButtonElement.cpp index 0d9cc921ad..7d7fa7f548 100644 --- a/dom/html/HTMLButtonElement.cpp +++ b/dom/html/HTMLButtonElement.cpp @@ -12,13 +12,13 @@ #include "nsAttrValueInlines.h" #include "nsIContentInlines.h" #include "nsGkAtoms.h" -#include "nsStyleConsts.h" #include "nsPresContext.h" #include "nsIFormControl.h" #include "nsIFrame.h" #include "nsIFormControlFrame.h" #include "mozilla/dom/Document.h" #include "mozilla/ContentEvents.h" +#include "mozilla/FocusModel.h" #include "mozilla/EventDispatcher.h" #include "mozilla/EventStateManager.h" #include "mozilla/MouseEvents.h" @@ -113,15 +113,14 @@ void HTMLButtonElement::GetType(nsAString& aType) { int32_t HTMLButtonElement::TabIndexDefault() { return 0; } -bool HTMLButtonElement::IsHTMLFocusable(bool aWithMouse, bool* aIsFocusable, +bool HTMLButtonElement::IsHTMLFocusable(IsFocusableFlags aFlags, + bool* aIsFocusable, int32_t* aTabIndex) { if (nsGenericHTMLFormControlElementWithState::IsHTMLFocusable( - aWithMouse, aIsFocusable, aTabIndex)) { + aFlags, aIsFocusable, aTabIndex)) { return true; } - - *aIsFocusable = IsFormControlDefaultFocusable(aWithMouse) && !IsDisabled(); - + *aIsFocusable = IsFormControlDefaultFocusable(aFlags) && !IsDisabled(); return false; } |