diff options
| author | athenian200 <athenian200@outlook.com> | 2020-01-16 14:07:04 -0600 |
|---|---|---|
| committer | athenian200 <athenian200@outlook.com> | 2020-01-16 14:07:04 -0600 |
| commit | 42e48167713abfa3c1f11274179b489bb6369b57 (patch) | |
| tree | 31ceba32e850ac856b09838c89e61e27df1538f0 /dom/html/nsGenericHTMLElement.cpp | |
| parent | e4c4c20e7e539d891c3f10b6ef5608c08699c077 (diff) | |
| download | UXP-42e48167713abfa3c1f11274179b489bb6369b57.tar UXP-42e48167713abfa3c1f11274179b489bb6369b57.tar.gz UXP-42e48167713abfa3c1f11274179b489bb6369b57.tar.lz UXP-42e48167713abfa3c1f11274179b489bb6369b57.tar.xz UXP-42e48167713abfa3c1f11274179b489bb6369b57.zip | |
Issue #1356 - Remove -moz-user-input disabled to improve event handling.
Diffstat (limited to 'dom/html/nsGenericHTMLElement.cpp')
| -rw-r--r-- | dom/html/nsGenericHTMLElement.cpp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/dom/html/nsGenericHTMLElement.cpp b/dom/html/nsGenericHTMLElement.cpp index 2f890325a..0c8bcc9c8 100644 --- a/dom/html/nsGenericHTMLElement.cpp +++ b/dom/html/nsGenericHTMLElement.cpp @@ -2109,14 +2109,6 @@ nsGenericHTMLFormElement::PreHandleEvent(EventChainPreVisitor& aVisitor) return nsGenericHTMLElement::PreHandleEvent(aVisitor); } -/* virtual */ -bool -nsGenericHTMLFormElement::IsDisabled() const -{ - return HasAttr(kNameSpaceID_None, nsGkAtoms::disabled) || - (mFieldSet && mFieldSet->IsDisabled()); -} - void nsGenericHTMLFormElement::ForgetFieldSet(nsIContent* aFieldset) { @@ -2308,14 +2300,13 @@ nsGenericHTMLFormElement::IsElementDisabledForEvents(EventMessage aMessage, break; } - bool disabled = IsDisabled(); - if (!disabled && aFrame) { - const nsStyleUserInterface* uiStyle = aFrame->StyleUserInterface(); - disabled = uiStyle->mUserInput == StyleUserInput::None || - uiStyle->mUserInput == StyleUserInput::Disabled; - + // FIXME(emilio): This poking at the style of the frame is slightly bogus + // unless we flush before every event, which we don't really want to do. + if (aFrame && + aFrame->StyleUserInterface()->mUserInput == StyleUserInput::None) { + return true; } - return disabled; + return IsDisabled(); } void |