Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1253977 part 1 - Update focus state on combobox frame destruction/construction properly. r=tn

Browse Source
This commit is contained in:
Mats Palmgren 2016-03-08 23:03:26 +01:00
parent 0524303c83
commit dec5bab458
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layout/forms/nsComboboxControlFrame.cpp
View File

@ -958,6 +958,10 @@ nsComboboxControlFrame::SetDropDown(nsIFrame* aDropDownFrame)
{
mDropdownFrame = aDropDownFrame;
mListControlFrame = do_QueryFrame(mDropdownFrame);
if (!sFocused && nsContentUtils::IsFocusedContent(GetContent())) {
sFocused = this;
nsListControlFrame::ComboboxFocusSet();
}
}
nsIFrame*
@ -1387,6 +1391,10 @@ nsComboboxControlFrame::CreateFrameFor(nsIContent* aContent)
void
nsComboboxControlFrame::DestroyFrom(nsIFrame* aDestructRoot)
{
if (sFocused == this) {
sFocused = nullptr;
}
// Revoke any pending RedisplayTextEvent
mRedisplayTextEvent.Revoke();