corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1838450 - Refine attribute handling. r=emilio

Browse Source 
https://github.com/whatwg/dom/pull/1176
https://dom.spec.whatwg.org/#concept-element-attributes-change-ext
"attribute change steps"  at https://html.spec.whatwg.org/multipage/popover.html#attr-popover

Differential Revision: https://phabricator.services.mozilla.com/D181880
This commit is contained in:
Ziran Sun
2023-07-04 08:47:31 +00:00
parent 3fcdf8a1d0
commit 10a0c38bc8
2 changed files with 23 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
dom/html/nsGenericHTMLElement.cpp
View File

@@ -668,45 +668,42 @@ constexpr PopoverAttributeState ToPopoverAttributeState(
} // namespace
void nsGenericHTMLElement::AfterSetPopoverAttr() {
const nsAttrValue* newValue = GetParsedAttr(nsGkAtoms::popover);
const PopoverAttributeState newState = [&newValue]() {
if (newValue) {
MOZ_ASSERT(newValue->Type() == nsAttrValue::eEnum);
auto mapPopoverState = [](const nsAttrValue* value) -> PopoverAttributeState {
if (value) {
MOZ_ASSERT(value->Type() == nsAttrValue::eEnum);
const auto popoverAttributeKeyword =
static_cast<PopoverAttributeKeyword>(newValue->GetEnumValue());
static_cast<PopoverAttributeKeyword>(value->GetEnumValue());
return ToPopoverAttributeState(popoverAttributeKeyword);
}
// The missing value default is the no popover state, see
// <https://html.spec.whatwg.org/multipage/popover.html#attr-popover>.
return PopoverAttributeState::None;
}();
};
PopoverAttributeState newState =
mapPopoverState(GetParsedAttr(nsGkAtoms::popover));
const PopoverAttributeState oldState = GetPopoverAttributeState();
if (newState != oldState) {
EnsurePopoverData().SetPopoverAttributeState(newState);
PopoverPseudoStateUpdate(false, true);
HidePopoverInternal(/* aFocusPreviousElement = */ true,
/* aFireEvents = */ true, IgnoreErrors());
if (IsPopoverOpen()) {
HidePopoverInternal(/* aFocusPreviousElement = */ true,
/* aFireEvents = */ true, IgnoreErrors());
// Event handlers could have removed the popover attribute, or changed
// its value.
newState = mapPopoverState(GetParsedAttr(nsGkAtoms::popover));
}
// In case `HidePopoverInternal` changed the state, keep the corresponding
// changes and don't overwrite anything here.
if (newState == GetPopoverAttributeState()) {
if (newState == PopoverAttributeState::None) {
// `HidePopoverInternal` above didn't remove the element from the top
// layer, because in that call, the element's popover attribute state
// was already `None`. Revisit this, when the spec is corrected
// (bug 1835811).
OwnerDoc()->RemovePopoverFromTopLayer(*this);
ClearPopoverData();
RemoveStates(ElementState::POPOVER_OPEN);
} else {
// TODO: what if `HidePopoverInternal` called `ShowPopup()`?
PopoverPseudoStateUpdate(false, true);
}
if (newState == PopoverAttributeState::None) {
OwnerDoc()->RemovePopoverFromTopLayer(*this);
ClearPopoverData();
RemoveStates(ElementState::POPOVER_OPEN);
} else {
// TODO: what if `HidePopoverInternal` called `ShowPopup()`?
EnsurePopoverData().SetPopoverAttributeState(newState);
}
}
}