Move onbeforematch to GlobalEventHandlers

Most event handlers like this should be in GlobalEventHandlers: whatwg/html#7475 (comment) R=vmpstr@chromium.org Bug: 1055002 Change-Id: I30fbf99b17db3703d8fb133bb3c581de2fa02141 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3530434 Reviewed-by: Vladimir Levin <vmpstr@chromium.org> Commit-Queue: Joey Arhar <jarhar@chromium.org> Cr-Commit-Position: refs/heads/main@{#983452} NOKEYCHECK=True GitOrigin-RevId: 695d94e6e2196d7fa86678a9a388fd679ef30fd4
mjfroman · Mar 21, 2022 · 82b8b65 · 82b8b65
1 parent e9dfcb5
commit 82b8b65
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 4 deletions.
diff --git a/blink/renderer/core/dom/element.h b/blink/renderer/core/dom/element.h
@@ -173,7 +173,6 @@ class CORE_EXPORT Element : public ContainerNode, public Animatable {
   DEFINE_ATTRIBUTE_EVENT_LISTENER(beforecut, kBeforecut)
   DEFINE_ATTRIBUTE_EVENT_LISTENER(beforepaste, kBeforepaste)
   DEFINE_ATTRIBUTE_EVENT_LISTENER(search, kSearch)
-  DEFINE_ATTRIBUTE_EVENT_LISTENER(beforematch, kBeforematch)
 
   bool hasAttribute(const QualifiedName&) const;
   const AtomicString& getAttribute(const QualifiedName&) const;

diff --git a/blink/renderer/core/dom/element.idl b/blink/renderer/core/dom/element.idl
@@ -150,7 +150,6 @@ callback ScrollStateCallback = void (ScrollState scrollState);
     attribute EventHandler onbeforecut;
     attribute EventHandler onbeforepaste;
     attribute EventHandler onsearch;
-    [RuntimeEnabled=BeforeMatchEvent] attribute EventHandler onbeforematch;
 
     // Element Timing
     [CEReactions, Reflect=elementtiming] attribute DOMString elementTiming;

diff --git a/blink/renderer/core/dom/global_event_handlers.h b/blink/renderer/core/dom/global_event_handlers.h
@@ -45,6 +45,7 @@ class GlobalEventHandlers {
                                          kAnimationiteration)
   DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(animationstart, kAnimationstart)
   DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(auxclick, kAuxclick)
+  DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(beforematch, kBeforematch)
   DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(blur, kBlur)
   DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(cancel, kCancel)
   DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(canplay, kCanplay)

diff --git a/blink/renderer/core/dom/global_event_handlers.idl b/blink/renderer/core/dom/global_event_handlers.idl
@@ -33,6 +33,7 @@
     LegacyTreatAsPartialInterface
 ] interface mixin GlobalEventHandlers {
     attribute EventHandler onabort;
+    [RuntimeEnabled=BeforeMatchEvent] attribute EventHandler onbeforematch;
     attribute EventHandler onblur;
     attribute EventHandler oncancel;
     attribute EventHandler oncanplay;

diff --git a/blink/web_tests/editing/text-iterator/onbeforematch.html b/blink/web_tests/editing/text-iterator/onbeforematch.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/pull/7475#issuecomment-1068519935">
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+
+<div id=target hidden=until-found>hello</div>
+
+<script>
+test(() => {
+  let beforematchHandled = false;
+  target.onbeforematch = () => beforematchHandled = true;
+  testRunner.findString('hello', []);
+  assert_true(beforematchHandled);
+}, `Verifies that element.onbeforematch registers a beforematch event handler.`);
+</script>
diff --git a/...tests/fast/dom/Window/property-access-on-cached-window-after-frame-navigated-expected.txt b/...tests/fast/dom/Window/property-access-on-cached-window-after-frame-navigated-expected.txt
@@ -106,6 +106,7 @@ PASS oldChildWindow.onanimationstart is newChildWindow.onanimationstart
 PASS oldChildWindow.onappinstalled is newChildWindow.onappinstalled
 PASS oldChildWindow.onauxclick is newChildWindow.onauxclick
 PASS oldChildWindow.onbeforeinstallprompt is newChildWindow.onbeforeinstallprompt
+PASS oldChildWindow.onbeforematch is newChildWindow.onbeforematch
 PASS oldChildWindow.onbeforeprint is newChildWindow.onbeforeprint
 PASS oldChildWindow.onbeforeunload is newChildWindow.onbeforeunload
 PASS oldChildWindow.onbeforexrselect is newChildWindow.onbeforexrselect

diff --git a/...ast/dom/Window/property-access-on-cached-window-after-frame-removed-and-gced-expected.txt b/...ast/dom/Window/property-access-on-cached-window-after-frame-removed-and-gced-expected.txt
@@ -51,6 +51,7 @@ PASS childWindow.onanimationstart is null
 PASS childWindow.onappinstalled is null
 PASS childWindow.onauxclick is null
 PASS childWindow.onbeforeinstallprompt is null
+PASS childWindow.onbeforematch is null
 PASS childWindow.onbeforeprint is null
 PASS childWindow.onbeforeunload is null
 PASS childWindow.onbeforexrselect is null

diff --git a/...b_tests/fast/dom/Window/property-access-on-cached-window-after-frame-removed-expected.txt b/...b_tests/fast/dom/Window/property-access-on-cached-window-after-frame-removed-expected.txt
@@ -51,6 +51,7 @@ PASS childWindow.onanimationstart is null
 PASS childWindow.onappinstalled is null
 PASS childWindow.onauxclick is null
 PASS childWindow.onbeforeinstallprompt is null
+PASS childWindow.onbeforematch is null
 PASS childWindow.onbeforeprint is null
 PASS childWindow.onbeforeunload is null
 PASS childWindow.onbeforexrselect is null

diff --git a/blink/web_tests/webexposed/global-interface-listing-expected.txt b/blink/web_tests/webexposed/global-interface-listing-expected.txt
@@ -1775,6 +1775,7 @@ interface Document : Node
     getter onauxclick
     getter onbeforecopy
     getter onbeforecut
+    getter onbeforematch
     getter onbeforepaste
     getter onbeforexrselect
     getter onblur
@@ -1980,6 +1981,7 @@ interface Document : Node
     setter onauxclick
     setter onbeforecopy
     setter onbeforecut
+    setter onbeforematch
     setter onbeforepaste
     setter onbeforexrselect
     setter onblur
@@ -2239,7 +2241,6 @@ interface Element : Node
     getter nextElementSibling
     getter onbeforecopy
     getter onbeforecut
-    getter onbeforematch
     getter onbeforepaste
     getter onfullscreenchange
     getter onfullscreenerror
@@ -2368,7 +2369,6 @@ interface Element : Node
     setter innerHTML
     setter onbeforecopy
     setter onbeforecut
-    setter onbeforematch
     setter onbeforepaste
     setter onfullscreenchange
     setter onfullscreenerror
@@ -3170,6 +3170,7 @@ interface HTMLElement : Element
     getter onanimationiteration
     getter onanimationstart
     getter onauxclick
+    getter onbeforematch
     getter onbeforexrselect
     getter onblur
     getter oncancel
@@ -3294,6 +3295,7 @@ interface HTMLElement : Element
     setter onanimationiteration
     setter onanimationstart
     setter onauxclick
+    setter onbeforematch
     setter onbeforexrselect
     setter onblur
     setter oncancel
@@ -5071,6 +5073,7 @@ interface MathMLElement : Element
     getter onanimationiteration
     getter onanimationstart
     getter onauxclick
+    getter onbeforematch
     getter onbeforexrselect
     getter onblur
     getter oncancel
@@ -5177,6 +5180,7 @@ interface MathMLElement : Element
     setter onanimationiteration
     setter onanimationstart
     setter onauxclick
+    setter onbeforematch
     setter onbeforexrselect
     setter onblur
     setter oncancel
@@ -7271,6 +7275,7 @@ interface SVGElement : Element
     getter onanimationiteration
     getter onanimationstart
     getter onauxclick
+    getter onbeforematch
     getter onbeforexrselect
     getter onblur
     getter oncancel
@@ -7379,6 +7384,7 @@ interface SVGElement : Element
     setter onanimationiteration
     setter onanimationstart
     setter onauxclick
+    setter onbeforematch
     setter onbeforexrselect
     setter onblur
     setter oncancel
@@ -11520,6 +11526,7 @@ namespace CSS
     getter onappinstalled
     getter onauxclick
     getter onbeforeinstallprompt
+    getter onbeforematch
     getter onbeforeprint
     getter onbeforeunload
     getter onbeforexrselect
@@ -11741,6 +11748,7 @@ namespace CSS
     setter onappinstalled
     setter onauxclick
     setter onbeforeinstallprompt
+    setter onbeforematch
     setter onbeforeprint
     setter onbeforeunload
     setter onbeforexrselect