Merging upstream version 127.0.

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

4 files changed, 45 insertions, 47 deletions

diff --git a/dom/interfaces/base/nsIDOMWindowUtils.idl b/dom/interfaces/base/nsIDOMWindowUtils.idl
index 27b9ff5acf..edb63f0041 100644
--- a/dom/interfaces/base/nsIDOMWindowUtils.idl
+++ b/dom/interfaces/base/nsIDOMWindowUtils.idl
@@ -1753,14 +1753,6 @@ interface nsIDOMWindowUtils : nsISupports {
   boolean isPartOfOpaqueLayer(in Element aElement);
 
   /**
-   * Count the number of different PaintedLayers that the supplied elements have
-   * been assigned to in the last paint. Throws an exception if any of the
-   * elements doesn't have a primary frame, or if that frame's display items are
-   * assigned to any other layers than just a single PaintedLayer per element.
-   */
-  unsigned long numberOfAssignedPaintedLayers(in Array<Element> aElements);
-
-  /**
    * Get internal id of the stored blob, file or file handle.
    */
   [implicit_jscontext] long long getFileId(in jsval aFile);
diff --git a/dom/interfaces/base/nsIFocusManager.idl b/dom/interfaces/base/nsIFocusManager.idl
index b27fb3e279..68a5040719 100644
--- a/dom/interfaces/base/nsIFocusManager.idl
+++ b/dom/interfaces/base/nsIFocusManager.idl
@@ -173,12 +173,12 @@ interface nsIFocusManager : nsISupports
   /*
    * Raise the window when switching focus
    */
-  const unsigned long FLAG_RAISE = 1;
+  const unsigned long FLAG_RAISE = 1 << 0;
 
   /**
    * Do not scroll the element to focus into view.
    */
-  const unsigned long FLAG_NOSCROLL = 2;
+  const unsigned long FLAG_NOSCROLL = 1 << 1;
 
   /**
    * If attempting to change focus in a window that is not focused, do not
@@ -187,7 +187,7 @@ interface nsIFocusManager : nsISupports
    * effect if a child window is focused and an attempt is made to adjust the
    * focus in an ancestor, as the frame must be switched in this case.
    */
-  const unsigned long FLAG_NOSWITCHFRAME = 4;
+  const unsigned long FLAG_NOSWITCHFRAME = 1 << 2;
 
   /**
    * This flag is only used when passed to moveFocus. If set, focus is never
@@ -195,26 +195,26 @@ interface nsIFocusManager : nsISupports
    * iterating around to the beginning of that document again. Child frames
    * are navigated as normal.
    */
-  const unsigned long FLAG_NOPARENTFRAME = 8;
+  const unsigned long FLAG_NOPARENTFRAME =  1 << 3;
 
   /**
    * This flag is used for window and element focus operations to signal
-   * wether the caller is system or non system.
+   * whether the caller is system or non system.
    */
-  const unsigned long FLAG_NONSYSTEMCALLER = 16;
+  const unsigned long FLAG_NONSYSTEMCALLER = 1 << 4;
 
   /**
    * Focus is changing due to a mouse operation, for instance the mouse was
    * clicked on an element.
    */
-  const unsigned long FLAG_BYMOUSE = 0x1000;
+  const unsigned long FLAG_BYMOUSE = 1 << 12;
 
   /**
    * Focus is changing due to a key operation, for instance pressing the tab
    * key. This flag would normally be passed when MOVEFOCUS_FORWARD or
    * MOVEFOCUS_BACKWARD is used.
    */
-  const unsigned long FLAG_BYKEY = 0x2000;
+  const unsigned long FLAG_BYKEY = 1 << 13;
 
   /**
    * Focus is changing due to a call to MoveFocus. This flag will be implied
@@ -222,31 +222,31 @@ interface nsIFocusManager : nsISupports
    * or key) is specified, or when the type is MOVEFOCUS_ROOT or
    * MOVEFOCUS_CARET.
    */
-  const unsigned long FLAG_BYMOVEFOCUS = 0x4000;
+  const unsigned long FLAG_BYMOVEFOCUS = 1 << 14;
 
   /**
    * Do not show a ring around the element to focus, if this is not a text
    * control, regardless of other state.
    */
-  const unsigned long FLAG_NOSHOWRING = 0x8000;
+  const unsigned long FLAG_NOSHOWRING = 1 << 15;
 
   /**
    * Always show the focus ring or other indicator of focus, regardless of
    * other state. Overrides FLAG_NOSHOWRING.
    */
-  const unsigned long FLAG_SHOWRING = 0x100000;
+  const unsigned long FLAG_SHOWRING = 1 << 16;
 
   /**
    * Focus is changing due to a touch operation that generated a mouse event.
    * Normally used in conjunction with FLAG_BYMOUSE.
    */
-  const unsigned long FLAG_BYTOUCH = 0x200000;
+  const unsigned long FLAG_BYTOUCH = 1 << 17;
 
   /** Focus is changing due to a JS focus() call or similar operation. */
-  const unsigned long FLAG_BYJS = 0x400000;
+  const unsigned long FLAG_BYJS = 1 << 18;
 
   /** Focus is changing due to a long press operation by touch or mouse. */
-  const unsigned long FLAG_BYLONGPRESS = 0x800000;
+  const unsigned long FLAG_BYLONGPRESS = 1 << 19;
 
   /** Mask with all the focus methods. */
   const unsigned long METHOD_MASK = FLAG_BYMOUSE | FLAG_BYKEY | FLAG_BYMOVEFOCUS | FLAG_BYTOUCH | FLAG_BYJS | FLAG_BYLONGPRESS;
diff --git a/dom/interfaces/notification/nsINotificationStorage.idl b/dom/interfaces/notification/nsINotificationStorage.idl
index c7a0b4490a..0052abf236 100644
--- a/dom/interfaces/notification/nsINotificationStorage.idl
+++ b/dom/interfaces/notification/nsINotificationStorage.idl
@@ -103,3 +103,7 @@ interface nsINotificationStorage : nsISupports
 %{C++
 #define NS_NOTIFICATION_STORAGE_CONTRACTID "@mozilla.org/notificationStorage;1"
 %}
+
+%{C++
+#define NS_MEMORY_NOTIFICATION_STORAGE_CONTRACTID "@mozilla.org/memoryNotificationStorage;1"
+%}
diff --git a/dom/interfaces/security/nsIContentSecurityPolicy.idl b/dom/interfaces/security/nsIContentSecurityPolicy.idl
index 26f00a0220..c73020efdc 100644
--- a/dom/interfaces/security/nsIContentSecurityPolicy.idl
+++ b/dom/interfaces/security/nsIContentSecurityPolicy.idl
@@ -40,31 +40,33 @@ interface nsIContentSecurityPolicy : nsISerializable
    * add it to the CSPStrDirectives array in nsCSPUtils.h.
    */
   cenum CSPDirective : 8 {
-    NO_DIRECTIVE                   = 0,
-    DEFAULT_SRC_DIRECTIVE          = 1,
-    SCRIPT_SRC_DIRECTIVE           = 2,
-    OBJECT_SRC_DIRECTIVE           = 3,
-    STYLE_SRC_DIRECTIVE            = 4,
-    IMG_SRC_DIRECTIVE              = 5,
-    MEDIA_SRC_DIRECTIVE            = 6,
-    FRAME_SRC_DIRECTIVE            = 7,
-    FONT_SRC_DIRECTIVE             = 8,
-    CONNECT_SRC_DIRECTIVE          = 9,
-    REPORT_URI_DIRECTIVE           = 10,
-    FRAME_ANCESTORS_DIRECTIVE      = 11,
-    REFLECTED_XSS_DIRECTIVE        = 12,
-    BASE_URI_DIRECTIVE             = 13,
-    FORM_ACTION_DIRECTIVE          = 14,
-    WEB_MANIFEST_SRC_DIRECTIVE     = 15,
-    UPGRADE_IF_INSECURE_DIRECTIVE  = 16,
-    CHILD_SRC_DIRECTIVE            = 17,
-    BLOCK_ALL_MIXED_CONTENT        = 18,
-    SANDBOX_DIRECTIVE              = 19,
-    WORKER_SRC_DIRECTIVE           = 20,
-    SCRIPT_SRC_ELEM_DIRECTIVE      = 21,
-    SCRIPT_SRC_ATTR_DIRECTIVE      = 22,
-    STYLE_SRC_ELEM_DIRECTIVE       = 23,
-    STYLE_SRC_ATTR_DIRECTIVE       = 24,
+    NO_DIRECTIVE                          = 0,
+    DEFAULT_SRC_DIRECTIVE                 = 1,
+    SCRIPT_SRC_DIRECTIVE                  = 2,
+    OBJECT_SRC_DIRECTIVE                  = 3,
+    STYLE_SRC_DIRECTIVE                   = 4,
+    IMG_SRC_DIRECTIVE                     = 5,
+    MEDIA_SRC_DIRECTIVE                   = 6,
+    FRAME_SRC_DIRECTIVE                   = 7,
+    FONT_SRC_DIRECTIVE                    = 8,
+    CONNECT_SRC_DIRECTIVE                 = 9,
+    REPORT_URI_DIRECTIVE                  = 10,
+    FRAME_ANCESTORS_DIRECTIVE             = 11,
+    REFLECTED_XSS_DIRECTIVE               = 12,
+    BASE_URI_DIRECTIVE                    = 13,
+    FORM_ACTION_DIRECTIVE                 = 14,
+    WEB_MANIFEST_SRC_DIRECTIVE            = 15,
+    UPGRADE_IF_INSECURE_DIRECTIVE         = 16,
+    CHILD_SRC_DIRECTIVE                   = 17,
+    BLOCK_ALL_MIXED_CONTENT               = 18,
+    SANDBOX_DIRECTIVE                     = 19,
+    WORKER_SRC_DIRECTIVE                  = 20,
+    SCRIPT_SRC_ELEM_DIRECTIVE             = 21,
+    SCRIPT_SRC_ATTR_DIRECTIVE             = 22,
+    STYLE_SRC_ELEM_DIRECTIVE              = 23,
+    STYLE_SRC_ATTR_DIRECTIVE              = 24,
+    REQUIRE_TRUSTED_TYPES_FOR_DIRECTIVE   = 25,
+    TRUSTED_TYPES_DIRECTIVE               = 26,
   };
 
   /**