Index: head/www/waterfox/Makefile =================================================================== --- head/www/waterfox/Makefile (revision 467272) +++ head/www/waterfox/Makefile (revision 467273) @@ -1,74 +1,74 @@ # $FreeBSD$ PORTNAME= waterfox DISTVERSION= 56.1.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org COMMENT= Distilled fork of Firefox DEPRECATED= Temporary experiment EXPIRATION_DATE=2018-05-16 BUILD_DEPENDS= nspr>=4.16:devel/nspr \ nss>=3.32.1:security/nss \ icu>=59.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=1.4.7:print/harfbuzz \ graphite2>=1.3.10:graphics/graphite2 \ png>=1.6.31:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.19.3:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip # soundtouch>=1.9.0:audio/soundtouch \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l USE_GITHUB= yes GH_ACCOUNT= MrAlex94 GH_PROJECT= Waterfox USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -soundtouch MOZILLA_NAME= Waterfox USE_GL= gl WATERFOX_ICON= ${MOZILLA}.png WATERFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default256.png WATERFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop MOZ_OPTIONS= --enable-application=browser \ --with-app-name=${MOZILLA} \ --with-app-basename=${MOZILLA_NAME} \ --with-distribution-id=org.${MOZILLA}project OPTIONS_DEFAULT= BUNDLED_CAIRO .include "${.CURDIR}/../../www/firefox/Makefile.options" post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e 's/firefox/${MOZILLA}/' \ -e 's/Firefox/${MOZILLA_NAME}/' \ ${WATERFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${INSTALL_DATA} ${WATERFOX_DESKTOP} \ ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${WATERFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${WATERFOX_ICON} .include Index: head/www/waterfox/files/patch-bug1449352 =================================================================== --- head/www/waterfox/files/patch-bug1449352 (nonexistent) +++ head/www/waterfox/files/patch-bug1449352 (revision 467273) @@ -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)) { Property changes on: head/www/waterfox/files/patch-bug1449352 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/waterfox/files/patch-bug1451673 =================================================================== --- head/www/waterfox/files/patch-bug1451673 (nonexistent) +++ head/www/waterfox/files/patch-bug1451673 (revision 467273) @@ -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) Property changes on: head/www/waterfox/files/patch-bug1451673 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property