tor-browser

commit 0a8cb65280f875592e0a2e1e5bd85e02a22bb85f
parent 196adee60bc254da57bd343c4e8aec1797a6619f
Author: Nicolas Chevobbe <nchevobbe@mozilla.com>
Date:   Fri,  5 Dec 2025 15:37:50 +0000

Bug 2003618 - [devtools] Refactor PageStyleActor observedRules usage. r=ochameau,devtools-reviewers

Declare the property as a Set and simplify how we're adding item onto it.
Also, nullify the property on destroy, like we do for other properties.

Differential Revision: https://phabricator.services.mozilla.com/D274826

Diffstat:
M
devtools/server/actors/page-style.js
 | 
29
++++++++++++++++-------------

1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/devtools/server/actors/page-style.js b/devtools/server/actors/page-style.js
@@ -107,7 +107,7 @@ class PageStyleActor extends Actor {
     this.styleSheetsManager.on("stylesheet-updated", this.#onStylesheetUpdated);
   }
 
-  #observedRules = [];
+  #observedRules = new Set();
 
   destroy() {
     if (!this.walker) {
@@ -122,7 +122,7 @@ class PageStyleActor extends Actor {
     this.cssLogic = null;
     this.styleSheetsByRootNode = null;
 
-    this.#observedRules = [];
+    this.#observedRules = null;
   }
 
   get ownerWindow() {
@@ -607,7 +607,7 @@ class PageStyleActor extends Actor {
     // Clear any previous references to StyleRuleActor instances for CSS rules.
     // Assume the consumer has switched context to a new node and no longer
     // interested in state changes of previous rules.
-    this.#observedRules = [];
+    this.#observedRules.clear();
     this.selectedElement = node?.rawNode || null;
 
     if (!node) {
@@ -625,17 +625,20 @@ class PageStyleActor extends Actor {
       options
     );
 
-    const entryRules = new Set();
-    entries.forEach(entry => {
-      entryRules.add(entry.rule);
-    });
-
-    await Promise.all(entries.map(entry => entry.rule.getAuthoredCssText()));
+    const promises = [];
+    for (const entry of entries) {
+      // Reference to instances of StyleRuleActor for CSS rules matching the node.
+      // Assume these are used by a consumer which wants to be notified when their
+      // state or declarations change either directly or indirectly.
+      this.#observedRules.add(entry.rule);
+      // We need to be sure that authoredText has been set before StyleRule#form is called.
+      // This has to be treated specially, for now, because we cannot synchronously compute
+      // the authored text and |form| can't return a promise.
+      // See bug 1205868.
+      promises.push(entry.rule.getAuthoredCssText());
+    }
 
-    // Reference to instances of StyleRuleActor for CSS rules matching the node.
-    // Assume these are used by a consumer which wants to be notified when their
-    // state or declarations change either directly or indirectly.
-    this.#observedRules = entryRules;
+    await Promise.all(promises);
 
     return { entries };
   }