Fix addEventListener signal option memory leak

AddEventListenerOptionsResolved holds a Member<AbortSignal>, which was
causing a circular reference keeping the AbortSignal alive forever.

Bug: 1148326
Fixed: 1155771
Change-Id: I673bc78c3ab2b10f40624958d9ea147be01c002f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2585674Reviewed-by: Mason Freed <masonfreed@chromium.org>
Commit-Queue: Joey Arhar <jarhar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#838272}

third_party/blink/renderer/core/dom/events/event_target.cc

@@ -529,15 +529,18 @@ bool EventTarget::AddEventListenerInternal(
       event_type, listener, options, &registered_listener);
   if (added) {
     if (options->hasSignal()) {
+      // Instead of passing the entire |options| here, which could create a
+      // circular reference due to |options| holding a Member<AbortSignal>, just
+      // pass the |options->capture()| boolean, which is the only thing
+      // removeEventListener actually uses to find and remove the event
+      // listener.
       options->signal()->AddAlgorithm(WTF::Bind(
           [](EventTarget* event_target, const AtomicString& event_type,
-             const EventListener* listener,
-             AddEventListenerOptionsResolved* options) {
-            event_target->removeEventListener(event_type, listener, options);
+             const EventListener* listener, bool capture) {
+            event_target->removeEventListener(event_type, listener, capture);
           },
           WrapWeakPersistent(this), event_type, WrapWeakPersistent(listener),
-          WrapPersistent(
-              MakeGarbageCollected<AddEventListenerOptionsResolved>(options))));
+          options->capture()));
       if (const LocalDOMWindow* executing_window = ExecutingWindow()) {
         if (const Document* document = executing_window->document()) {
           document->CountUse(WebFeature::kAddEventListenerWithAbortSignal);

third_party/blink/web_tests/TestExpectations

@@ -5890,10 +5890,6 @@ crbug.com/1032681 virtual/disable-frequency-capping-for-overlay-popup-detection/
 # Sheriff 2020-12-03
 crbug.com/1154940 [ Win7 ] inspector-protocol/overlay/overlay-persistent-overlays-with-emulation.js [ Pass Failure ]
 
-# Sheriff 2020-12-04
-# Failing on Webkit Linux Leak
-crbug.com/1155771 [ Linux ] external/wpt/dom/events/AddEventListenerOptions-signal.any.html [ Pass Failure ]
-
 # DevTools roll
 crbug.com/1144171 http/tests/devtools/report-API-errors.js [ Skip ]