Merge remote-tracking branch 'origin/master' into custom

application/palemoon/components/places/PlacesUIUtils.jsm

@@ -759,7 +759,9 @@ this.PlacesUIUtils = {
       if (PlacesUtils.nodeIsURI(aNodes[i]))
         urlsToOpen.push({uri: aNodes[i].uri, isBookmark: PlacesUtils.nodeIsBookmark(aNodes[i])});
     }
-    this._openTabset(urlsToOpen, aEvent, window);
+    if (this._confirmOpenInTabs(urlsToOpen.length, window)) {
+      this._openTabset(urlsToOpen, aEvent, window);
+    }
   },
 
   /**

application/palemoon/components/places/content/controller.js

@@ -633,7 +633,7 @@ PlacesController.prototype = {
       if (!openContainerInTabsItem.hidden) {
         var containerToUse = this._view.selectedNode || this._view.result.root;
         if (PlacesUtils.nodeIsContainer(containerToUse)) {
-          if (!PlacesUtils.hasChildURIs(containerToUse, true)) {
+          if (!PlacesUtils.hasChildURIs(containerToUse)) {
             openContainerInTabsItem.disabled = true;
             // Ensure that we don't display the menu if nothing is enabled:
             usableItemCount--;

application/palemoon/components/places/content/sidebarUtils.js

@@ -36,7 +36,7 @@ var SidebarUtils = {
     var openInTabs = isContainer &&
                      (aEvent.button == 1 ||
                       (aEvent.button == 0 && modifKey)) &&
-                     PlacesUtils.hasChildURIs(tbo.view.nodeForTreeIndex(cell.row), true);
+                     PlacesUtils.hasChildURIs(tbo.view.nodeForTreeIndex(cell.row));
 
     if (aEvent.button == 0 && isContainer && !openInTabs) {
       tbo.view.toggleOpenState(cell.row);

dom/canvas/WebGLFramebuffer.cpp

@@ -1216,6 +1216,7 @@ WebGLFramebuffer::RefreshDrawBuffers() const
         }
     }
 
+    gl->fBindFramebuffer(LOCAL_GL_DRAW_FRAMEBUFFER, mGLName);
     gl->fDrawBuffers(driverBuffers.size(), driverBuffers.data());
 }
 
@@ -1235,6 +1236,7 @@ WebGLFramebuffer::RefreshReadBuffer() const
         driverBuffer = mColorReadBuffer->mAttachmentPoint;
     }
 
+    gl->fBindFramebuffer(LOCAL_GL_READ_FRAMEBUFFER, mGLName);
     gl->fReadBuffer(driverBuffer);
 }
 

dom/html/HTMLLinkElement.h

@@ -109,6 +109,14 @@ public:
     SetHTMLAttr(nsGkAtoms::rel, aRel, aRv);
   }
   nsDOMTokenList* RelList();
+  void GetNonce(nsAString& aNonce) const
+  {
+    GetHTMLAttr(nsGkAtoms::nonce, aNonce);
+  }
+  void SetNonce(const nsAString& aNonce, ErrorResult& aRv)
+  {
+    SetHTMLAttr(nsGkAtoms::nonce, aNonce, aRv);
+  }
   // XPCOM GetMedia is fine.
   void SetMedia(const nsAString& aMedia, ErrorResult& aRv)
   {

dom/html/HTMLScriptElement.h

@@ -80,6 +80,14 @@ public:
   {
     SetOrRemoveNullableStringAttr(nsGkAtoms::crossorigin, aCrossOrigin, aError);
   }
+  void GetNonce(nsAString& aNonce) const
+  {
+    GetHTMLAttr(nsGkAtoms::nonce, aNonce);
+  }
+  void SetNonce(const nsAString& aNonce, ErrorResult& aRv)
+  {
+    SetHTMLAttr(nsGkAtoms::nonce, aNonce, aRv);
+  }
   void GetIntegrity(nsAString& aIntegrity)
   {
     GetHTMLAttr(nsGkAtoms::integrity, aIntegrity);

dom/html/HTMLStyleElement.h

@@ -60,6 +60,14 @@ public:
 
   bool Disabled() const;
   void SetDisabled(bool aDisabled);
+  void GetNonce(nsAString& aNonce) const
+  {
+    GetHTMLAttr(nsGkAtoms::nonce, aNonce);
+  }
+  void SetNonce(const nsAString& aNonce, ErrorResult& aRv)
+  {
+    SetHTMLAttr(nsGkAtoms::nonce, aNonce, aRv);
+  }
   void SetMedia(const nsAString& aMedia, ErrorResult& aError)
   {
     SetHTMLAttr(nsGkAtoms::media, aMedia, aError);

dom/webidl/HTMLLinkElement.webidl

@@ -26,6 +26,8 @@ interface HTMLLinkElement : HTMLElement {
   readonly attribute DOMTokenList relList;
   [CEReactions, SetterThrows, Pure]
            attribute DOMString media;
+  [CEReactions, SetterThrows, Pure]
+           attribute DOMString nonce;
   [CEReactions, SetterThrows, Pure]
            attribute DOMString hreflang;
   [CEReactions, SetterThrows, Pure]

dom/webidl/HTMLScriptElement.webidl

@@ -26,6 +26,10 @@ interface HTMLScriptElement : HTMLElement {
   attribute DOMString? crossOrigin;
   [CEReactions, SetterThrows]
   attribute DOMString text;
+  [CEReactions, SetterThrows, Pure]
+  attribute DOMString nonce;
+  [CEReactions, SetterThrows, Pure]
+  attribute DOMString integrity;
 };
 
 // http://www.whatwg.org/specs/web-apps/current-work/#other-elements,-attributes-and-apis
@@ -35,9 +39,3 @@ partial interface HTMLScriptElement {
   [CEReactions, SetterThrows]
   attribute DOMString htmlFor;
 };
-
-// https://w3c.github.io/webappsec/specs/subresourceintegrity/#htmlscriptelement-1
-partial interface HTMLScriptElement {
-  [CEReactions, SetterThrows]
-  attribute DOMString integrity;
-};

dom/webidl/HTMLStyleElement.webidl

@@ -15,6 +15,8 @@ interface HTMLStyleElement : HTMLElement {
            [CEReactions, SetterThrows, Pure]
            attribute DOMString media;
            [CEReactions, SetterThrows, Pure]
+           attribute DOMString nonce;
+           [CEReactions, SetterThrows, Pure]
            attribute DOMString type;
            [SetterThrows, Pure]
            attribute boolean scoped;

netwerk/base/nsIOService.cpp

@@ -1203,13 +1203,14 @@ nsIOService::SetConnectivityInternal(bool aConnectivity)
 NS_IMETHODIMP
 nsIOService::AllowPort(int32_t inPort, const char *scheme, bool *_retval)
 {
-    int16_t port = inPort;
+    int32_t port = inPort;
     if (port == -1) {
         *_retval = true;
         return NS_OK;
     }
 
-    if (port == 0) {
+    // Ensure the port number is within a valid range
+    if (port <= 0 || port >= std::numeric_limits<uint16_t>::max()) {
         *_retval = false;
         return NS_OK;
     }