Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 24 insertions, 12 deletions

diff --git a/dom/chrome-webidl/ChromeUtils.webidl b/dom/chrome-webidl/ChromeUtils.webidl
index 3ccb125a1e..e1a4c3bedf 100644
--- a/dom/chrome-webidl/ChromeUtils.webidl
+++ b/dom/chrome-webidl/ChromeUtils.webidl
@@ -975,6 +975,7 @@ dictionary PartitionKeyPatternDictionary {
   DOMString scheme;
   DOMString baseDomain;
   long port;
+  boolean foreignByAncestorContext;
 };
 
 dictionary CompileScriptOptionsDictionary {
diff --git a/dom/chrome-webidl/InspectorUtils.webidl b/dom/chrome-webidl/InspectorUtils.webidl
index 64cd610804..b379118e8a 100644
--- a/dom/chrome-webidl/InspectorUtils.webidl
+++ b/dom/chrome-webidl/InspectorUtils.webidl
@@ -89,16 +89,24 @@ namespace InspectorUtils {
   sequence<DOMString> getRegisteredCssHighlights(Document document, optional boolean activeOnly = false);
   sequence<InspectorCSSPropertyDefinition> getCSSRegisteredProperties(Document document);
 
-  // Get the start and end offsets of the first rule body within initialText
+  // Get the first rule body text within initialText
   // Consider the following example:
   // p {
   //  line-height: 2em;
   //  color: blue;
   // }
-  // Calling the function with the whole text above would return offsets we can use to
-  // get "line-height: 2em; color: blue;"
+  // Calling the function with the whole text above would return:
+  // "line-height: 2em; color: blue;"
   // Returns null when opening curly bracket wasn't found in initialText
-  InspectorGetRuleBodyTextResult? getRuleBodyTextOffsets(UTF8String initialText);
+  UTF8String? getRuleBodyText(UTF8String initialText);
+
+  // Returns string where the rule body text at passed line and column in styleSheetText
+  // is replaced by newBodyText.
+  UTF8String? replaceBlockRuleBodyTextInStylesheet(
+    UTF8String styleSheetText,
+    unsigned long line,
+    unsigned long column,
+    UTF8String newBodyText);
 };
 
 dictionary SupportsOptions {
@@ -177,11 +185,6 @@ dictionary InspectorCSSPropertyDefinition {
   required boolean fromJS;
 };
 
-dictionary InspectorGetRuleBodyTextResult {
-  required double startOffset;
-  required double endOffset;
-};
-
 dictionary InspectorStyleSheetRuleCountAndAtRulesResult {
   required sequence<CSSRule> atRules;
   required unsigned long ruleCount;
diff --git a/dom/chrome-webidl/PlacesObservers.webidl b/dom/chrome-webidl/PlacesObservers.webidl
index 662d8558ff..77c917a3c5 100644
--- a/dom/chrome-webidl/PlacesObservers.webidl
+++ b/dom/chrome-webidl/PlacesObservers.webidl
@@ -11,6 +11,12 @@ interface PlacesWeakCallbackWrapper {
   constructor(PlacesEventCallback callback);
 };
 
+// Counters for number of events sent in the current session.
+[ChromeOnly, Exposed=Window]
+interface PlacesEventCounts {
+  readonly maplike<DOMString, unsigned long long>;
+};
+
 // Global singleton which should handle all events for places.
 [ChromeOnly, Exposed=Window]
 namespace PlacesObservers {
@@ -28,4 +34,6 @@ namespace PlacesObservers {
                            PlacesWeakCallbackWrapper listener);
   [Throws]
   undefined notifyListeners(sequence<PlacesEvent> events);
+
+  readonly attribute PlacesEventCounts counts;
 };
diff --git a/dom/chrome-webidl/StripOnShareRule.webidl b/dom/chrome-webidl/StripOnShareRule.webidl
index 446070ed8b..c151dd06a2 100644
--- a/dom/chrome-webidl/StripOnShareRule.webidl
+++ b/dom/chrome-webidl/StripOnShareRule.webidl
@@ -10,6 +10,6 @@
  */
 [GenerateInitFromJSON]
 dictionary StripRule {
-  sequence<DOMString> queryParams = [];
-  sequence<DOMString> topLevelSites = [];
+  sequence<UTF8String> queryParams = [];
+  sequence<UTF8String> topLevelSites = [];
 };
diff --git a/dom/chrome-webidl/UniFFI.webidl b/dom/chrome-webidl/UniFFI.webidl
index 7a3f68fbbd..e24fc9cc5d 100644
--- a/dom/chrome-webidl/UniFFI.webidl
+++ b/dom/chrome-webidl/UniFFI.webidl
@@ -35,7 +35,7 @@ typedef unsigned long long UniFFICallbackObjectHandle;
 
 // Opaque type used to represent a pointer from Rust
 [ChromeOnly, Exposed=Window]
-interface UniFFIPointer {};
+interface UniFFIPointer { };
 
 // Types that can be passed or returned from scaffolding functions
 //