fixup

Author: ronag

lib/internal/event_target.js

@@ -552,6 +552,8 @@ class EventTarget {
  initEventTarget(this);
  }
 
+ #fastHandlers = new Map();
+
  [kNewListener](size, type, listener, once, capture, passive, weak) {
  if (this[kMaxEventTargetListeners] > 0 &&
  size > this[kMaxEventTargetListeners] &&
@@ -644,45 +646,58 @@ class EventTarget {
  }
  }
 
- type = webidl.converters.DOMString(type);
-
- let root = this[kEvents].get(type);
+ if (options === kEmptyObject && this.#fastHandlers != null) {
+ const entry = this.#fastHandlers.get(type);
+ if (entry === undefined) {
+ this.#fastHandlers.set(type, listener);
+ } else if (typeof entry === 'function') {
+ this.#fastHandlers.set(type, new Set([entry, listener]));
+ } else {
+ entry.add(listener);
+ }
+ } else {
+ // XXX: Convert fastMode to slowMode....
+
+ type = webidl.converters.DOMString(type);
+
+ let root = this[kEvents].get(type);
+
+ if (root === undefined) {
+ root = { size: 1, next: undefined, resistStopPropagation: Boolean(resistStopPropagation) };
+ // This is the first handler in our linked list.
+ new Listener(this, type, root, listener, once, capture, passive,
+ isNodeStyleListener, weak, resistStopPropagation);
+ this[kNewListener](
+ root.size,
+ type,
+ listener,
+ once,
+ capture,
+ passive,
+ weak);
+ this[kEvents].set(type, root);
+ return;
+ }
 
- if (root === undefined) {
- root = { size: 1, next: undefined, resistStopPropagation: Boolean(resistStopPropagation) };
- // This is the first handler in our linked list.
- new Listener(this, type, root, listener, once, capture, passive,
- isNodeStyleListener, weak, resistStopPropagation);
- this[kNewListener](
- root.size,
- type,
- listener,
- once,
- capture,
- passive,
- weak);
- this[kEvents].set(type, root);
- return;
- }
+ let handler = root.next;
+ let previous = root;
 
- let handler = root.next;
- let previous = root;
+ // We have to walk the linked list to see if we have a match
+ while (handler !== undefined && !handler.same(listener, capture)) {
+ previous = handler;
+ handler = handler.next;
+ }
 
- // We have to walk the linked list to see if we have a match
- while (handler !== undefined && !handler.same(listener, capture)) {
- previous = handler;
- handler = handler.next;
- }
+ if (handler !== undefined) { // Duplicate! Ignore
+ return;
+ }
 
- if (handler !== undefined) { // Duplicate! Ignore
- return;
+ new Listener(this, type, previous, listener, once, capture, passive,
+ isNodeStyleListener, weak, resistStopPropagation);
+ root.size++;
+ root.resistStopPropagation ||= Boolean(resistStopPropagation);
+ this[kNewListener](root.size, type, listener, once, capture, passive, weak);
  }
-
- new Listener(this, type, previous, listener, once, capture, passive,
- isNodeStyleListener, weak, resistStopPropagation);
- root.size++;
- root.resistStopPropagation ||= Boolean(resistStopPropagation);
- this[kNewListener](root.size, type, listener, once, capture, passive, weak);
  }
 
  /**
@@ -700,24 +715,37 @@ class EventTarget {
  if (!validateEventListener(listener))
  return;
 
- type = webidl.converters.DOMString(type);
- const capture = options?.capture === true;
-
- const root = this[kEvents].get(type);
- if (root === undefined || root.next === undefined)
- return;
-
- let handler = root.next;
- while (handler !== undefined) {
- if (handler.same(listener, capture)) {
- handler.remove();
- root.size--;
- if (root.size === 0)
- this[kEvents].delete(type);
- this[kRemoveListener](root.size, type, listener, capture);
- break;
+ if (options === kEmptyObject && this.#fastHandlers != null) {
+ const entry = this.#fastHandlers.get(type);
+ if (entry === undefined) {
+ // Do nothing
+ } else if (entry === listener) {
+ this.#fastHandlers.delete(type);
+ } else {
+ entry.delete(listener);
+ }
+ } else {
+ // XXX: Convert fastMode to slowMode....
+
+ type = webidl.converters.DOMString(type);
+ const capture = options?.capture === true;
+
+ const root = this[kEvents].get(type);
+ if (root === undefined || root.next === undefined)
+ return;
+
+ let handler = root.next;
+ while (handler !== undefined) {
+ if (handler.same(listener, capture)) {
+ handler.remove();
+ root.size--;
+ if (root.size === 0)
+ this[kEvents].delete(type);
+ this[kRemoveListener](root.size, type, listener, capture);
+ break;
+ }
+ handler = handler.next;
  }
- handler = handler.next;
  }
  }
 
@@ -764,77 +792,81 @@ class EventTarget {
  }
 
  [kHybridDispatch](nodeValue, type, event) {
- const createEvent = () => {
- if (event === undefined) {
- event = this[kCreateEvent](nodeValue, type);
+ if (this.#fastHandlers != null) {
+ // XXX: Implement
+ } else {
+ const createEvent = () => {
+ if (event === undefined) {
+ event = this[kCreateEvent](nodeValue, type);
+ event[kTarget] = this;
+ event[kIsBeingDispatched] = true;
+ }
+ return event;
+ };
+ if (event !== undefined) {
  event[kTarget] = this;
  event[kIsBeingDispatched] = true;
  }
- return event;
- };
- if (event !== undefined) {
- event[kTarget] = this;
- event[kIsBeingDispatched] = true;
- }
-
- const root = this[kEvents].get(type);
- if (root === undefined || root.next === undefined) {
- if (event !== undefined)
- event[kIsBeingDispatched] = false;
- return true;
- }
 
- let handler = root.next;
- let next;
-
- const iterationCondition = () => {
- if (handler === undefined) {
- return false;
- }
- return root.resistStopPropagation || handler.passive || event?.[kStop] !== true;
- };
- while (iterationCondition()) {
- // Cache the next item in case this iteration removes the current one
- next = handler.next;
-
- if (handler.removed || (event?.[kStop] === true && !handler.resistStopPropagation)) {
- // Deal with the case an event is removed while event handlers are
- // Being processed (removeEventListener called from a listener)
- // And the case of event.stopImmediatePropagation() being called
- // For events not flagged as resistStopPropagation
- handler = next;
- continue;
- }
- if (handler.once) {
- handler.remove();
- root.size--;
- const { listener, capture } = handler;
- this[kRemoveListener](root.size, type, listener, capture);
+ const root = this[kEvents].get(type);
+ if (root === undefined || root.next === undefined) {
+ if (event !== undefined)
+ event[kIsBeingDispatched] = false;
+ return true;
  }
 
- try {
- let arg;
- if (handler.isNodeStyleListener) {
- arg = nodeValue;
- } else {
- arg = createEvent();
+ let handler = root.next;
+ let next;
+
+ const iterationCondition = () => {
+ if (handler === undefined) {
+ return false;
+ }
+ return root.resistStopPropagation || handler.passive || event?.[kStop] !== true;
+ };
+ while (iterationCondition()) {
+ // Cache the next item in case this iteration removes the current one
+ next = handler.next;
+
+ if (handler.removed || (event?.[kStop] === true && !handler.resistStopPropagation)) {
+ // Deal with the case an event is removed while event handlers are
+ // Being processed (removeEventListener called from a listener)
+ // And the case of event.stopImmediatePropagation() being called
+ // For events not flagged as resistStopPropagation
+ handler = next;
+ continue;
+ }
+ if (handler.once) {
+ handler.remove();
+ root.size--;
+ const { listener, capture } = handler;
+ this[kRemoveListener](root.size, type, listener, capture);
  }
- const callback = handler.weak ?
- handler.callback.deref() : handler.callback;
- let result;
- if (callback) {
- result = FunctionPrototypeCall(callback, this, arg);
- if (!handler.isNodeStyleListener) {
- arg[kIsBeingDispatched] = false;
+
+ try {
+ let arg;
+ if (handler.isNodeStyleListener) {
+ arg = nodeValue;
+ } else {
+ arg = createEvent();
+ }
+ const callback = handler.weak ?
+ handler.callback.deref() : handler.callback;
+ let result;
+ if (callback) {
+ result = FunctionPrototypeCall(callback, this, arg);
+ if (!handler.isNodeStyleListener) {
+ arg[kIsBeingDispatched] = false;
+ }
  }
+ if (result !== undefined && result !== null)
+ addCatch(result);
+ } catch (err) {
+ emitUncaughtException(err);
  }
- if (result !== undefined && result !== null)
- addCatch(result);
- } catch (err) {
- emitUncaughtException(err);
- }
 
- handler = next;
+ handler = next;
+ }
  }
 
  if (event !== undefined)