Merge branch 'current' of github.com:MrAlex94/Waterfox into current

BrowserWorks · Aug 4, 2020 · 5694f91 · 5694f91
2 parents afbe679 + fffa8a9
commit 5694f91
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/browser/components/customizableui/content/toolbar.xml b/browser/components/customizableui/content/toolbar.xml
@@ -13,6 +13,25 @@
       <constructor><![CDATA[
           let scope = {};
           ChromeUtils.import("resource:///modules/CustomizableUI.jsm", scope);
+
+          if (document.readyState == "complete") {
+            this._init();
+          } else {
+            // Need to wait until XUL overlays are loaded. See bug 554279.
+            let self = this;
+            document.addEventListener("readystatechange", function onReadyStateChange() {
+              if (document.readyState != "complete")
+                return;
+              document.removeEventListener("readystatechange", onReadyStateChange);
+              self._init();
+            });
+          }
+      ]]></constructor>
+
+      <method name="_init">
+        <body><![CDATA[
+          let scope = {};
+          ChromeUtils.import("resource:///modules/CustomizableUI.jsm", scope);
           let CustomizableUI = scope.CustomizableUI;
 
           // Searching for the toolbox palette in the toolbar binding because
@@ -34,7 +53,8 @@
                               .filter(node => node.getAttribute("skipintoolbarset") != "true" && node.id)
                               .map(node => node.id);
           CustomizableUI.registerToolbarNode(this, children);
-      ]]></constructor>
+      ]]></body>
+      </method>
 
       <method name="insertItem">
         <parameter name="aId"/>

diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp
@@ -1139,6 +1139,8 @@ class ContentSandboxPolicy : public SandboxPolicyCommon {
 
       case __NR_getpriority:
       case __NR_setpriority:
+      case __NR_sched_getattr:
+      case __NR_sched_setattr:
       case __NR_sched_get_priority_min:
       case __NR_sched_get_priority_max:
       case __NR_sched_getscheduler: