MFH: r472399

www/waterfox: update to 56.2.0.53

Changes:	https://github.com/MrAlex94/Waterfox/compare/f435a827f82ac...79affc3bb939f
Approved by:	ports-secteam blanket

6 files changed, 4 insertions, 198 deletions

diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile
index 8c509103c3ea..eff3dcd076e5 100644
--- a/www/waterfox/Makefile
+++ b/www/waterfox/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	waterfox
-DISTVERSION=	56.2.0-31
-DISTVERSIONSUFFIX=	-gf435a827f82ac
-PORTREVISION=	7
+DISTVERSION=	56.2.0-53
+DISTVERSIONSUFFIX=	-g79affc3bb939f
 CATEGORIES=	www ipv6
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/www/waterfox/distinfo b/www/waterfox/distinfo
index 24c414d293aa..a5ef0f846ac9 100644
--- a/www/waterfox/distinfo
+++ b/www/waterfox/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1527689655
-SHA256 (MrAlex94-Waterfox-56.2.0-31-gf435a827f82ac_GH0.tar.gz) = 3a16f2078bad349971853281acd5bde95dbd34a56f6765e2adfd9be4230d9587
-SIZE (MrAlex94-Waterfox-56.2.0-31-gf435a827f82ac_GH0.tar.gz) = 395154259
+SHA256 (MrAlex94-Waterfox-56.2.0-53-g79affc3bb939f_GH0.tar.gz) = c5c8ffa4704c122905bef92a8df78d0ca957b0f231c15f8b2dd6bd6b6ae0a3c1
+SIZE (MrAlex94-Waterfox-56.2.0-53-g79affc3bb939f_GH0.tar.gz) = 395135433
diff --git a/www/waterfox/files/patch-bug1450688 b/www/waterfox/files/patch-bug1450688
deleted file mode 100644
index 399611798c61..000000000000
--- a/www/waterfox/files/patch-bug1450688
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 1a52ecbef0ba
-Author: Kris Maglione <maglione.k@gmail.com>
-Date:   Tue May 15 16:01:36 2018 -0700
-
-    Bug 1450688 r=bz
-    
-    MozReview-Commit-ID: 4KHNpxiziWd
-    
-    --HG--
-    extra : rebase_source : a6f61c63b4a806bd099b63b3bcaa31e014163ad4
----
- dom/xbl/nsXBLBinding.cpp | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git dom/xbl/nsXBLBinding.cpp dom/xbl/nsXBLBinding.cpp
-index 01360088ced1f..76ad62d2b55ef 100644
---- dom/xbl/nsXBLBinding.cpp
-+++ dom/xbl/nsXBLBinding.cpp
-@@ -963,7 +963,17 @@ nsXBLBinding::DoInitJSClass(JSContext *cx,
-   NS_ENSURE_TRUE(xblScope, NS_ERROR_UNEXPECTED);
- 
-   JS::Rooted<JSObject*> parent_proto(cx);
--  if (!JS_GetPrototype(cx, obj, &parent_proto)) {
-+  {
-+    JS::RootedObject wrapped(cx, obj);
-+    JSAutoCompartment ac(cx, xblScope);
-+    if (!JS_WrapObject(cx, &wrapped)) {
-+      return NS_ERROR_FAILURE;
-+    }
-+    if (!JS_GetPrototype(cx, wrapped, &parent_proto)) {
-+      return NS_ERROR_FAILURE;
-+    }
-+  }
-+  if (!JS_WrapObject(cx, &parent_proto)) {
-     return NS_ERROR_FAILURE;
-   }
- 
diff --git a/www/waterfox/files/patch-bug1458264 b/www/waterfox/files/patch-bug1458264
deleted file mode 100644
index effbd7543acb..000000000000
--- a/www/waterfox/files/patch-bug1458264
+++ /dev/null
@@ -1,56 +0,0 @@
-commit 6b3071113783
-Author: jgilbert@mozilla.com <jdashg@gmail.com>
-Date:   Thu May 24 15:45:25 2018 -0700
-
-    Bug 1458264 - Reset UNPACK_SKIP vars when uploading zeros. r=kvark, a=RyanVM
-    
-    MozReview-Commit-ID: ILB6MqgnrXX
-    
-    --HG--
-    extra : rebase_source : 645475fd6b978b00b0b61eef42df2a771563968c
-    extra : source : c2f90b73e27aa5402636aee5f03891298502c416
----
- dom/canvas/WebGLContextDraw.cpp | 21 +++++++++++++++------
- 1 file changed, 15 insertions(+), 6 deletions(-)
-
-diff --git dom/canvas/WebGLContextDraw.cpp dom/canvas/WebGLContextDraw.cpp
-index a28d93325692b..3f179477b3bcd 100644
---- dom/canvas/WebGLContextDraw.cpp
-+++ dom/canvas/WebGLContextDraw.cpp
-@@ -205,7 +205,21 @@ WebGLContext::BindFakeBlack(uint32_t texUnit, TexTarget target, FakeBlackType fa
-     UniquePtr<FakeBlackTexture>& fakeBlackTex = *slot;
- 
-     if (!fakeBlackTex) {
-+        gl->fPixelStorei(LOCAL_GL_UNPACK_ALIGNMENT, 1);
-+        if (IsWebGL2()) {
-+            gl->fPixelStorei(LOCAL_GL_UNPACK_SKIP_PIXELS, 0);
-+            gl->fPixelStorei(LOCAL_GL_UNPACK_SKIP_ROWS, 0);
-+            gl->fPixelStorei(LOCAL_GL_UNPACK_SKIP_IMAGES, 0);
-+        }
-+
-         fakeBlackTex = FakeBlackTexture::Create(gl, target, fakeBlack);
-+
-+        gl->fPixelStorei(LOCAL_GL_UNPACK_ALIGNMENT, mPixelStore_UnpackAlignment);
-+        if (IsWebGL2()) {
-+            gl->fPixelStorei(LOCAL_GL_UNPACK_SKIP_PIXELS, mPixelStore_UnpackSkipPixels);
-+            gl->fPixelStorei(LOCAL_GL_UNPACK_SKIP_ROWS, mPixelStore_UnpackSkipRows);
-+            gl->fPixelStorei(LOCAL_GL_UNPACK_SKIP_IMAGES, mPixelStore_UnpackSkipImages);
-+        }
-         if (!fakeBlackTex) {
-             return false;
-         }
-@@ -995,13 +1009,8 @@ WebGLContext::FakeBlackTexture::Create(gl::GLContext* gl, TexTarget target,
-     gl->fTexParameteri(target.get(), LOCAL_GL_TEXTURE_MIN_FILTER, LOCAL_GL_NEAREST);
-     gl->fTexParameteri(target.get(), LOCAL_GL_TEXTURE_MAG_FILTER, LOCAL_GL_NEAREST);
- 
--    // We allocate our zeros on the heap, and we overallocate (16 bytes instead of 4) to
--    // minimize the risk of running into a driver bug in texImage2D, as it is a bit
--    // unusual maybe to create 1x1 textures, and the stack may not have the alignment that
--    // TexImage2D expects.
--
-     const webgl::DriverUnpackInfo dui = {texFormat, texFormat, LOCAL_GL_UNSIGNED_BYTE};
--    UniqueBuffer zeros = moz_xcalloc(1, 16); // Infallible allocation.
-+    UniqueBuffer zeros = moz_xcalloc(1, 4); // Infallible allocation.
- 
-     MOZ_ASSERT(gl->IsCurrent());
- 
diff --git a/www/waterfox/files/patch-bug1462682 b/www/waterfox/files/patch-bug1462682
deleted file mode 100644
index 1580bb777417..000000000000
--- a/www/waterfox/files/patch-bug1462682
+++ /dev/null
@@ -1,32 +0,0 @@
-commit dc5382e1b765
-Author: Lee Salzman <lsalzman@mozilla.com>
-Date:   Fri May 25 00:57:45 2018 -0400
-
-    Bug 1462682 - Skia path bounds rounding fix. r=rhunt, a=RyanVM
-    
-    MozReview-Commit-ID: Lm0XhyLLCCV
-    
-    --HG--
-    extra : source : 784deba1907770c8f4c3482509ae99d474c4439f
----
- gfx/skia/skia/src/core/SkScan_Path.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git gfx/skia/skia/src/core/SkScan_Path.cpp gfx/skia/skia/src/core/SkScan_Path.cpp
-index 2373e62d46ff2..90a22305260f1 100644
---- gfx/skia/skia/src/core/SkScan_Path.cpp
-+++ gfx/skia/skia/src/core/SkScan_Path.cpp
-@@ -564,7 +564,12 @@ static bool clip_to_limit(const SkRegion& orig, SkRegion* reduced) {
- // Bias used for conservative rounding of float rects to int rects, to nudge the irects a little
- // larger, so we don't "think" a path's bounds are inside a clip, when (due to numeric drift in
- // the scan-converter) we might walk beyond the predicted limits.
--static const double kConservativeRoundBias = 0.5 + 0.5 / SK_FDot6One;
-+//
-+// This value has been determined trial and error: pick the smallest value (after the 0.5) that
-+// fixes any problematic cases (e.g. crbug.com/844457)
-+// NOTE: cubics appear to be the main reason for needing this slop. If we could (perhaps) have a
-+// more accurate walker for cubics, we may be able to reduce this fudge factor.
-+static const double kConservativeRoundBias = 0.5 + 1.5 / SK_FDot6One;
- 
- /**
-  *  Round the value down. This is used to round the top and left of a rectangle,
diff --git a/www/waterfox/files/patch-bug1464784 b/www/waterfox/files/patch-bug1464784
deleted file mode 100644
index badcb3244d01..000000000000
--- a/www/waterfox/files/patch-bug1464784
+++ /dev/null
@@ -1,68 +0,0 @@
-commit b175f5f2113b
-Author: Boris Zbarsky <bzbarsky@mit.edu>
-Date:   Thu May 31 12:43:01 2018 -0400
-
-    Bug 1464784 - Hold a strong ref to the document in callers of ConvertNodesOrStringsIntoNode. r=smaug, a=abillings
----
- dom/base/nsINode.cpp | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git dom/base/nsINode.cpp dom/base/nsINode.cpp
-index 3a649a61d0274..fbbf1efcb2dde 100644
---- dom/base/nsINode.cpp
-+++ dom/base/nsINode.cpp
-@@ -1777,8 +1777,8 @@ nsINode::Before(const Sequence<OwningNodeOrString>& aNodes,
-   nsCOMPtr<nsINode> viablePreviousSibling =
-     FindViablePreviousSibling(*this, aNodes);
- 
--  nsCOMPtr<nsINode> node =
--    ConvertNodesOrStringsIntoNode(aNodes, OwnerDoc(), aRv);
-+  nsCOMPtr<nsIDocument> doc = OwnerDoc();
-+  nsCOMPtr<nsINode> node = ConvertNodesOrStringsIntoNode(aNodes, doc, aRv);
-   if (aRv.Failed()) {
-     return;
-   }
-@@ -1800,8 +1800,8 @@ nsINode::After(const Sequence<OwningNodeOrString>& aNodes,
- 
-   nsCOMPtr<nsINode> viableNextSibling = FindViableNextSibling(*this, aNodes);
- 
--  nsCOMPtr<nsINode> node =
--    ConvertNodesOrStringsIntoNode(aNodes, OwnerDoc(), aRv);
-+  nsCOMPtr<nsIDocument> doc = OwnerDoc();
-+  nsCOMPtr<nsINode> node = ConvertNodesOrStringsIntoNode(aNodes, doc, aRv);
-   if (aRv.Failed()) {
-     return;
-   }
-@@ -1820,8 +1820,8 @@ nsINode::ReplaceWith(const Sequence<OwningNodeOrString>& aNodes,
- 
-   nsCOMPtr<nsINode> viableNextSibling = FindViableNextSibling(*this, aNodes);
- 
--  nsCOMPtr<nsINode> node =
--    ConvertNodesOrStringsIntoNode(aNodes, OwnerDoc(), aRv);
-+  nsCOMPtr<nsIDocument> doc = OwnerDoc();
-+  nsCOMPtr<nsINode> node = ConvertNodesOrStringsIntoNode(aNodes, doc, aRv);
-   if (aRv.Failed()) {
-     return;
-   }
-@@ -1880,8 +1880,8 @@ void
- nsINode::Prepend(const Sequence<OwningNodeOrString>& aNodes,
-                  ErrorResult& aRv)
- {
--  nsCOMPtr<nsINode> node =
--    ConvertNodesOrStringsIntoNode(aNodes, OwnerDoc(), aRv);
-+  nsCOMPtr<nsIDocument> doc = OwnerDoc();
-+  nsCOMPtr<nsINode> node = ConvertNodesOrStringsIntoNode(aNodes, doc, aRv);
-   if (aRv.Failed()) {
-     return;
-   }
-@@ -1894,8 +1894,8 @@ void
- nsINode::Append(const Sequence<OwningNodeOrString>& aNodes,
-                  ErrorResult& aRv)
- {
--  nsCOMPtr<nsINode> node =
--    ConvertNodesOrStringsIntoNode(aNodes, OwnerDoc(), aRv);
-+  nsCOMPtr<nsIDocument> doc = OwnerDoc();
-+  nsCOMPtr<nsINode> node = ConvertNodesOrStringsIntoNode(aNodes, doc, aRv);
-   if (aRv.Failed()) {
-     return;
-   }