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

Bug 1841505: postpone setting the popover invoker in the "show popover" algo. r=emilio

Browse Source 
See
<https://github.com/whatwg/html/issues/9383#issuecomment-1602227494>.

Differential Revision: https://phabricator.services.mozilla.com/D182709
This commit is contained in:
Mirko Brodesser
2023-07-12 10:12:23 +00:00
parent 5a5548cce2
commit 5beede8d62
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dom/html/nsGenericHTMLElement.cpp
View File

@@ -3330,16 +3330,14 @@ void nsGenericHTMLElement::RunPopoverToggleEventTask(
void nsGenericHTMLElement::ShowPopover(ErrorResult& aRv) {
return ShowPopoverInternal(nullptr, aRv);
}
void nsGenericHTMLElement::ShowPopoverInternal(
nsGenericHTMLFormControlElementWithState* aInvoker, ErrorResult& aRv) {
if (PopoverData* data = GetPopoverData()) {
data->SetInvoker(aInvoker);
}
void nsGenericHTMLElement::ShowPopoverInternal(Element* aInvoker,
ErrorResult& aRv) {
if (!CheckPopoverValidity(PopoverVisibilityState::Hidden, nullptr, aRv)) {
return;
}
RefPtr<Document> document = OwnerDoc();
MOZ_ASSERT(!GetPopoverData() || !GetPopoverData()->GetInvoker());
MOZ_ASSERT(!OwnerDoc()->TopLayerContains(*this));
bool wasShowingOrHiding = GetPopoverData()->IsShowingOrHiding();
@@ -3363,7 +3361,7 @@ void nsGenericHTMLElement::ShowPopoverInternal(
nsWeakPtr originallyFocusedElement;
if (IsAutoPopover()) {
auto originalState = GetPopoverAttributeState();
RefPtr<nsINode> ancestor = GetTopmostPopoverAncestor();
RefPtr<nsINode> ancestor = GetTopmostPopoverAncestor(aInvoker);
if (!ancestor) {
ancestor = document;
}
@@ -3396,7 +3394,12 @@ void nsGenericHTMLElement::ShowPopoverInternal(
document->AddPopoverToTopLayer(*this);
PopoverPseudoStateUpdate(true, true);
GetPopoverData()->SetPopoverVisibilityState(PopoverVisibilityState::Showing);
{
auto* popoverData = GetPopoverData();
popoverData->SetPopoverVisibilityState(PopoverVisibilityState::Showing);
popoverData->SetInvoker(aInvoker);
}
// Run the popover focusing steps given element.
FocusPopover();