svn commit: r467275 - in branches/2018Q2/www/waterfox: . files

[Jan Beich]

Author: jbeich
Date: Fri Apr 13 22:09:26 2018
New Revision: 467275
URL: https://svnweb.freebsd.org/changeset/ports/467275

Log:
  MFH: r467273
  
  www/waterfox: apply some FF60 fixes
  
  Approved by:	ports-secteam blanket

Added:
  branches/2018Q2/www/waterfox/files/patch-bug1449352
     - copied unchanged from r467273, head/www/waterfox/files/patch-bug1449352
  branches/2018Q2/www/waterfox/files/patch-bug1451673
     - copied unchanged from r467273, head/www/waterfox/files/patch-bug1451673
Modified:
  branches/2018Q2/www/waterfox/Makefile
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/www/waterfox/Makefile
==============================================================================
--- branches/2018Q2/www/waterfox/Makefile	Fri Apr 13 22:07:49 2018	(r467274)
+++ branches/2018Q2/www/waterfox/Makefile	Fri Apr 13 22:09:26 2018	(r467275)
@@ -2,7 +2,7 @@
 
 PORTNAME=	waterfox
 DISTVERSION=	56.1.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www ipv6
 
 MAINTAINER=	jbeich at FreeBSD.org

Copied: branches/2018Q2/www/waterfox/files/patch-bug1449352 (from r467273, head/www/waterfox/files/patch-bug1449352)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q2/www/waterfox/files/patch-bug1449352	Fri Apr 13 22:09:26 2018	(r467275, copy of r467273, head/www/waterfox/files/patch-bug1449352)
@@ -0,0 +1,52 @@
+commit d09c62cb1ed0
+Author: Lee Salzman <lsalzman at mozilla.com>
+Date:   Tue Apr 10 12:43:59 2018 -0400
+
+    Bug 1449352 - always composite 24 depth WindowSurfaceX11 as BGRX. r=jrmuizel a=jcristau
+    
+    MozReview-Commit-ID: 3xeE3EEttR6
+    
+    --HG--
+    extra : source : c6860625a6fd2bcb64f23e9a621521741ae7503e
+---
+ widget/gtk/WindowSurfaceX11.cpp      | 8 +-------
+ widget/gtk/WindowSurfaceX11Image.cpp | 4 ++++
+ 2 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git widget/gtk/WindowSurfaceX11.cpp widget/gtk/WindowSurfaceX11.cpp
+index 32e3c43ef9ef..a5616f77a6ed 100644
+--- widget/gtk/WindowSurfaceX11.cpp
++++ widget/gtk/WindowSurfaceX11.cpp
+@@ -36,16 +36,10 @@ WindowSurfaceX11::GetVisualFormat(const Visual* aVisual, unsigned int aDepth)
+     }
+     break;
+   case 24:
+-    // Only support the BGRX layout, and report it as BGRA to the compositor.
+-    // The alpha channel will be discarded when we put the image.
+-    // Cairo/pixman lacks some fast paths for compositing BGRX onto BGRA, so
+-    // just report it as BGRX directly in that case.
+     if (aVisual->red_mask == 0xff0000 &&
+         aVisual->green_mask == 0xff00 &&
+         aVisual->blue_mask == 0xff) {
+-      gfx::BackendType backend = gfxPlatform::GetPlatform()->GetDefaultContentBackend();
+-      return backend == gfx::BackendType::CAIRO ? gfx::SurfaceFormat::B8G8R8X8
+-                                                : gfx::SurfaceFormat::B8G8R8A8;
++      return gfx::SurfaceFormat::B8G8R8X8;
+     }
+     break;
+   case 16:
+diff --git widget/gtk/WindowSurfaceX11Image.cpp widget/gtk/WindowSurfaceX11Image.cpp
+index 59db17b642f2..f89d0d1a13d5 100644
+--- widget/gtk/WindowSurfaceX11Image.cpp
++++ widget/gtk/WindowSurfaceX11Image.cpp
+@@ -58,6 +58,10 @@ WindowSurfaceX11Image::Lock(const LayoutDeviceIntRegion& aRegion)
+ 
+   gfxImageFormat format = mImageSurface->Format();
+   // Cairo prefers compositing to BGRX instead of BGRA where possible.
++  // Cairo/pixman lacks some fast paths for compositing BGRX onto BGRA, so
++  // just report it as BGRX directly in that case.
++  // Otherwise, for Skia, report it as BGRA to the compositor. The alpha
++  // channel will be discarded when we put the image.
+   if (format == gfx::SurfaceFormat::X8R8G8B8_UINT32) {
+     gfx::BackendType backend = gfxVars::ContentBackend();
+     if (!gfx::Factory::DoesBackendSupportDataDrawtarget(backend)) {

Copied: branches/2018Q2/www/waterfox/files/patch-bug1451673 (from r467273, head/www/waterfox/files/patch-bug1451673)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q2/www/waterfox/files/patch-bug1451673	Fri Apr 13 22:09:26 2018	(r467275, copy of r467273, head/www/waterfox/files/patch-bug1451673)
@@ -0,0 +1,28 @@
+commit 5dbb51979bb7
+Author: alexander :surkov <surkov.alexander at gmail.com>
+Date:   Thu Apr 5 10:24:00 2018 +0300
+
+    Bug 1451673 - "Crash in mozilla::a11y::HTMLTableAccessible::IsProbablyLayoutTable" r=MarcoZ a=jcristau
+    
+    --HG--
+    extra : source : 5a6db1121fcede3d0844ec1be195ab7858cd1e19
+---
+ accessible/html/HTMLTableAccessible.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git accessible/html/HTMLTableAccessible.cpp accessible/html/HTMLTableAccessible.cpp
+index 18c7c71a0ae2..1647f3251ec8 100644
+--- accessible/html/HTMLTableAccessible.cpp
++++ accessible/html/HTMLTableAccessible.cpp
+@@ -1063,6 +1063,11 @@ HTMLTableAccessible::IsProbablyLayoutTable()
+     if (child->Role() == roles::ROW) {
+       prevRowColor = rowColor;
+       nsIFrame* rowFrame = child->GetFrame();
++      MOZ_ASSERT(rowFrame, "Table hierarchy got screwed up");
++      if (!rowFrame) {
++        RETURN_LAYOUT_ANSWER(false, "Unexpected table hierarchy");
++      }
++
+       rowColor = rowFrame->StyleBackground()->BackgroundColor(rowFrame);
+ 
+       if (childIdx > 0 && prevRowColor != rowColor)