From owner-svn-ports-head@freebsd.org Fri Apr 13 22:07:36 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 815B8F86031; Fri, 13 Apr 2018 22:07:36 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 247EB750C8; Fri, 13 Apr 2018 22:07:36 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1458D1F8A8; Fri, 13 Apr 2018 22:07:36 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3DM7Zwa004163; Fri, 13 Apr 2018 22:07:35 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3DM7ZqL004160; Fri, 13 Apr 2018 22:07:35 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804132207.w3DM7ZqL004160@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 13 Apr 2018 22:07:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467273 - in head/www/waterfox: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/www/waterfox: . files X-SVN-Commit-Revision: 467273 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2018 22:07:36 -0000 Author: jbeich Date: Fri Apr 13 22:07:35 2018 New Revision: 467273 URL: https://svnweb.freebsd.org/changeset/ports/467273 Log: www/waterfox: apply some FF60 fixes Added: head/www/waterfox/files/patch-bug1449352 (contents, props changed) head/www/waterfox/files/patch-bug1451673 (contents, props changed) Modified: head/www/waterfox/Makefile (contents, props changed) Modified: head/www/waterfox/Makefile ============================================================================== --- head/www/waterfox/Makefile Fri Apr 13 21:51:27 2018 (r467272) +++ head/www/waterfox/Makefile Fri Apr 13 22:07:35 2018 (r467273) @@ -2,7 +2,7 @@ PORTNAME= waterfox DISTVERSION= 56.1.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org Added: head/www/waterfox/files/patch-bug1449352 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/waterfox/files/patch-bug1449352 Fri Apr 13 22:07:35 2018 (r467273) @@ -0,0 +1,52 @@ +commit d09c62cb1ed0 +Author: Lee Salzman +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)) { Added: head/www/waterfox/files/patch-bug1451673 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/waterfox/files/patch-bug1451673 Fri Apr 13 22:07:35 2018 (r467273) @@ -0,0 +1,28 @@ +commit 5dbb51979bb7 +Author: alexander :surkov +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)