Retire call capture listeners flag
Retire the stable flag
CallCaptureListenersAtCapturePhaseAtShadowHosts
The flag has been stable since
https://chromium-review.googlesource.com/1229741
BUG=883650
Change-Id: Ib7468e3dde14b28e32587f9c9a100debcfee88ff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1616713
Reviewed-by: Hayato Ito <hayato@chromium.org>
Reviewed-by: Fernando Serboncini <fserb@chromium.org>
Commit-Queue: Fernando Serboncini <fserb@chromium.org>
Auto-Submit: Eric Willigers <ericwilligers@chromium.org>
Cr-Commit-Position: refs/heads/master@{#661764}
diff --git a/third_party/blink/renderer/core/dom/events/event.h b/third_party/blink/renderer/core/dom/events/event.h
index bce7cf1..caf9764 100644
--- a/third_party/blink/renderer/core/dom/events/event.h
+++ b/third_party/blink/renderer/core/dom/events/event.h
@@ -344,8 +344,6 @@
// https://dom.spec.whatwg.org/#concept-event-listener-inner-invoke
unsigned legacy_did_listeners_throw_flag_ : 1;
- // This fields are effective only when
- // CallCaptureListenersAtCapturePhaseAtShadowHosts runtime flag is enabled.
unsigned fire_only_capture_listeners_at_target_ : 1;
unsigned fire_only_non_capture_listeners_at_target_ : 1;
diff --git a/third_party/blink/renderer/core/dom/events/event_dispatcher.cc b/third_party/blink/renderer/core/dom/events/event_dispatcher.cc
index 3b6dab5..90c8500 100644
--- a/third_party/blink/renderer/core/dom/events/event_dispatcher.cc
+++ b/third_party/blink/renderer/core/dom/events/event_dispatcher.cc
@@ -239,9 +239,6 @@
for (wtf_size_t i = event_->GetEventPath().size() - 1; i > 0; --i) {
const NodeEventContext& event_context = event_->GetEventPath()[i];
if (event_context.CurrentTargetSameAsTarget()) {
- if (!RuntimeEnabledFeatures::
- CallCaptureListenersAtCapturePhaseAtShadowHostsEnabled())
- continue;
event_->SetEventPhase(Event::kAtTarget);
event_->SetFireOnlyCaptureListenersAtTarget(true);
event_context.HandleLocalEvents(*event_);
@@ -272,14 +269,9 @@
if (event_context.CurrentTargetSameAsTarget()) {
// TODO(hayato): Need to check cancelBubble() also here?
event_->SetEventPhase(Event::kAtTarget);
- if (RuntimeEnabledFeatures::
- CallCaptureListenersAtCapturePhaseAtShadowHostsEnabled()) {
- event_->SetFireOnlyNonCaptureListenersAtTarget(true);
- event_context.HandleLocalEvents(*event_);
- event_->SetFireOnlyNonCaptureListenersAtTarget(false);
- } else {
- event_context.HandleLocalEvents(*event_);
- }
+ event_->SetFireOnlyNonCaptureListenersAtTarget(true);
+ event_context.HandleLocalEvents(*event_);
+ event_->SetFireOnlyNonCaptureListenersAtTarget(false);
} else if (event_->bubbles() && !event_->cancelBubble()) {
event_->SetEventPhase(Event::kBubblingPhase);
event_context.HandleLocalEvents(*event_);
diff --git a/third_party/blink/renderer/core/dom/events/registered_event_listener.cc b/third_party/blink/renderer/core/dom/events/registered_event_listener.cc
index f2977bc..13c187c5 100644
--- a/third_party/blink/renderer/core/dom/events/registered_event_listener.cc
+++ b/third_party/blink/renderer/core/dom/events/registered_event_listener.cc
@@ -84,24 +84,14 @@
}
bool RegisteredEventListener::ShouldFire(const Event& event) const {
- if (RuntimeEnabledFeatures::
- CallCaptureListenersAtCapturePhaseAtShadowHostsEnabled()) {
- if (event.FireOnlyCaptureListenersAtTarget()) {
- DCHECK_EQ(event.eventPhase(), Event::kAtTarget);
- return Capture();
- }
- if (event.FireOnlyNonCaptureListenersAtTarget()) {
- DCHECK_EQ(event.eventPhase(), Event::kAtTarget);
- return !Capture();
- }
- if (event.eventPhase() == Event::kCapturingPhase)
- return Capture();
- if (event.eventPhase() == Event::kBubblingPhase)
- return !Capture();
- return true;
+ if (event.FireOnlyCaptureListenersAtTarget()) {
+ DCHECK_EQ(event.eventPhase(), Event::kAtTarget);
+ return Capture();
}
- DCHECK(!event.FireOnlyCaptureListenersAtTarget());
- DCHECK(!event.FireOnlyNonCaptureListenersAtTarget());
+ if (event.FireOnlyNonCaptureListenersAtTarget()) {
+ DCHECK_EQ(event.eventPhase(), Event::kAtTarget);
+ return !Capture();
+ }
if (event.eventPhase() == Event::kCapturingPhase)
return Capture();
if (event.eventPhase() == Event::kBubblingPhase)
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index 1900e1fb..af6f1e6 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -222,10 +222,6 @@
status: "stable",
},
{
- name: "CallCaptureListenersAtCapturePhaseAtShadowHosts",
- status: "stable",
- },
- {
name: "Canvas2dContextLostRestored",
status: "experimental",
},
