nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1874881 - Remove pref dom.events.phases.correctOrderOnTarget. r=dom-core,edgar

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D198691
This commit is contained in:
Vincent Hilla 2024-01-23 08:01:16 +00:00
parent 772512ffd6
commit cd3ae60da5
2 changed files with 6 additions and 23 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

22
dom/events/EventDispatcher.cpp
View file

@ -585,12 +585,7 @@ void EventTargetChainItem::HandleEventTargetChain(
} }
// Target // Target
const bool prefCorrectOrder =
StaticPrefs::dom_events_phases_correctOrderOnTarget();
aVisitor.mEvent->mFlags.mInTargetPhase = true; aVisitor.mEvent->mFlags.mInTargetPhase = true;
if (!prefCorrectOrder) {
aVisitor.mEvent->mFlags.mInBubblingPhase = true;
}
EventTargetChainItem& targetItem = chain[firstCanHandleEventTargetIdx]; EventTargetChainItem& targetItem = chain[firstCanHandleEventTargetIdx];
// Need to explicitly retarget touch targets so that initial targets get set // Need to explicitly retarget touch targets so that initial targets get set
// properly in case nothing else retargeted touches. // properly in case nothing else retargeted touches.
@ -602,23 +597,18 @@ void EventTargetChainItem::HandleEventTargetChain(
targetItem.ForceContentDispatch())) { targetItem.ForceContentDispatch())) {
targetItem.HandleEvent(aVisitor, aCd); targetItem.HandleEvent(aVisitor, aCd);
} }
if (prefCorrectOrder) { aVisitor.mEvent->mFlags.mInCapturePhase = false;
aVisitor.mEvent->mFlags.mInCapturePhase = false; aVisitor.mEvent->mFlags.mInBubblingPhase = true;
aVisitor.mEvent->mFlags.mInBubblingPhase = true; if (!aVisitor.mEvent->PropagationStopped() &&
if (!aVisitor.mEvent->PropagationStopped() && (!aVisitor.mEvent->mFlags.mNoContentDispatch ||
(!aVisitor.mEvent->mFlags.mNoContentDispatch || targetItem.ForceContentDispatch())) {
targetItem.ForceContentDispatch())) { targetItem.HandleEvent(aVisitor, aCd);
targetItem.HandleEvent(aVisitor, aCd);
}
} }
if (aVisitor.mEvent->mFlags.mInSystemGroup) { if (aVisitor.mEvent->mFlags.mInSystemGroup) {
targetItem.PostHandleEvent(aVisitor); targetItem.PostHandleEvent(aVisitor);
} }
aVisitor.mEvent->mFlags.mInTargetPhase = false; aVisitor.mEvent->mFlags.mInTargetPhase = false;
if (!prefCorrectOrder) {
aVisitor.mEvent->mFlags.mInCapturePhase = false;
}
// Bubble // Bubble
for (uint32_t i = firstCanHandleEventTargetIdx + 1; i < chainLength; ++i) { for (uint32_t i = firstCanHandleEventTargetIdx + 1; i < chainLength; ++i) {

7
modules/libpref/init/StaticPrefList.yaml
View file

@ -2528,13 +2528,6 @@
mirror: always mirror: always
do_not_use_directly: true do_not_use_directly: true
# Guard for bug 1731504, in case fix breaks more websites
# If true, event is first captured then bubbled on target element
- name: dom.events.phases.correctOrderOnTarget
type: RelaxedAtomicBool
value: true
mirror: always
# This pref controls whether or not the `protected` dataTransfer state is # This pref controls whether or not the `protected` dataTransfer state is
# enabled. If the `protected` dataTransfer stae is disabled, then the # enabled. If the `protected` dataTransfer stae is disabled, then the
# DataTransfer will be read-only whenever it should be protected, and will not # DataTransfer will be read-only whenever it should be protected, and will not