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/HTMLOptGroupElement.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/HTMLOptGroupElement.cpp')
-rw-r--r-- | dom/html/HTMLOptGroupElement.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/dom/html/HTMLOptGroupElement.cpp b/dom/html/HTMLOptGroupElement.cpp index 8a044fbf3..9e738961d 100644 --- a/dom/html/HTMLOptGroupElement.cpp +++ b/dom/html/HTMLOptGroupElement.cpp @@ -53,15 +53,14 @@ HTMLOptGroupElement::PreHandleEvent(EventChainPreVisitor& aVisitor) aVisitor.mCanHandle = false; // Do not process any DOM events if the element is disabled // XXXsmaug This is not the right thing to do. But what is? - if (HasAttr(kNameSpaceID_None, nsGkAtoms::disabled)) { + if (IsDisabled()) { return NS_OK; } - nsIFrame* frame = GetPrimaryFrame(); - if (frame) { - const nsStyleUserInterface* uiStyle = frame->StyleUserInterface(); - if (uiStyle->mUserInput == StyleUserInput::None || - uiStyle->mUserInput == StyleUserInput::Disabled) { + if (nsIFrame* frame = GetPrimaryFrame()) { + // FIXME(emilio): This poking at the style of the frame is broken unless we + // flush before every event handling, which we don't really want to. + if (frame->StyleUserInterface()->mUserInput == StyleUserInput::None) { return NS_OK; } } |