diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
| commit | 39dac57259cff8b61db0b22cb2ad0a8adb02692e (patch) | |
| tree | 52a026cc8c22793eb17fd0f5e22adce1ae08a1dd /layout/forms/nsComboboxControlFrame.cpp | |
| parent | a1cce3b2b00bbd9f4983013ddd8934a7bccb9e99 (diff) | |
| parent | c2d9ab62f3d097c9e0e00184cab1f546554f5eaa (diff) | |
| download | UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.gz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.lz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.xz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.zip | |
Merge branch 'redwood' into 28.9-platform
Diffstat (limited to 'layout/forms/nsComboboxControlFrame.cpp')
| -rw-r--r-- | layout/forms/nsComboboxControlFrame.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp index 5a9438939..78185616f 100644 --- a/layout/forms/nsComboboxControlFrame.cpp +++ b/layout/forms/nsComboboxControlFrame.cpp @@ -1165,9 +1165,7 @@ nsComboboxControlFrame::HandleEvent(nsPresContext* aPresContext, // If we have style that affects how we are selected, feed event down to // nsFrame::HandleEvent so that selection takes place when appropriate. - const nsStyleUserInterface* uiStyle = StyleUserInterface(); - if (uiStyle->mUserInput == StyleUserInput::None || - uiStyle->mUserInput == StyleUserInput::Disabled) { + if (IsContentDisabled()) { return nsBlockFrame::HandleEvent(aPresContext, aEvent, aEventStatus); } return NS_OK; |