From owner-svn-ports-all@freebsd.org Tue Mar 12 00:59:05 2019 Return-Path: Delivered-To: svn-ports-all@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 F0F321534994; Tue, 12 Mar 2019 00:59:04 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8FF6B8C8DE; Tue, 12 Mar 2019 00:59:04 +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 81CE81AD56; Tue, 12 Mar 2019 00:59:04 +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 x2C0x4us046304; Tue, 12 Mar 2019 00:59:04 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2C0x43f046302; Tue, 12 Mar 2019 00:59:04 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201903120059.x2C0x43f046302@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 12 Mar 2019 00:59:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495404 - in head/www/firefox: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/www/firefox: . files X-SVN-Commit-Revision: 495404 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8FF6B8C8DE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.995,0]; NEURAL_HAM_SHORT(-0.98)[-0.975,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2019 00:59:05 -0000 Author: jbeich Date: Tue Mar 12 00:59:03 2019 New Revision: 495404 URL: https://svnweb.freebsd.org/changeset/ports/495404 Log: www/firefox: add one more WeBrender+Wayland fix Added: head/www/firefox/files/patch-bug1532024 (contents, props changed) Modified: head/www/firefox/Makefile (contents, props changed) Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Tue Mar 12 00:55:59 2019 (r495403) +++ head/www/firefox/Makefile Tue Mar 12 00:59:03 2019 (r495404) @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 66.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Added: head/www/firefox/files/patch-bug1532024 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug1532024 Tue Mar 12 00:59:03 2019 (r495404) @@ -0,0 +1,106 @@ +commit 554777b1d130 +Author: sotaro +Date: Wed Mar 6 08:17:51 2019 +0000 + + Bug 1532024 - Handle a case that GetRemoteRenderer() returned nullptr r=stransky + + Differential Revision: https://phabricator.services.mozilla.com/D21831 + + --HG-- + extra : moz-landing-system : lando +--- + widget/gtk/nsWindow.cpp | 27 ++++++++++++++++++--------- + widget/gtk/nsWindow.h | 3 +++ + 2 files changed, 21 insertions(+), 9 deletions(-) + +diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp +index 96faeea1cf87..46956412f341 100644 +--- widget/gtk/nsWindow.cpp ++++ widget/gtk/nsWindow.cpp +@@ -399,6 +399,10 @@ nsWindow::nsWindow() { + mXDepth = 0; + #endif /* MOZ_X11 */ + ++#ifdef MOZ_WAYLAND ++ mNeedsUpdatingEGLSurface = false; ++#endif ++ + if (!gGlobalsInitialized) { + gGlobalsInitialized = true; + +@@ -1872,12 +1876,14 @@ static bool ExtractExposeRegion(LayoutDeviceIntRegion &aRegion, cairo_t *cr) { + void nsWindow::WaylandEGLSurfaceForceRedraw() { + MOZ_RELEASE_ASSERT(NS_IsMainThread()); + +- if (mIsDestroyed) { ++ if (mIsDestroyed || !mNeedsUpdatingEGLSurface) { + return; + } + +- if (CompositorBridgeChild* remoteRenderer = GetRemoteRenderer()) { ++ if (CompositorBridgeChild *remoteRenderer = GetRemoteRenderer()) { ++ MOZ_ASSERT(mCompositorWidgetDelegate); + if (mCompositorWidgetDelegate) { ++ mNeedsUpdatingEGLSurface = false; + mCompositorWidgetDelegate->RequestsUpdatingEGLSurface(); + } + remoteRenderer->SendForcePresent(); +@@ -3483,10 +3489,10 @@ nsresult nsWindow::Create(nsIWidget *aParent, nsNativeWidget aNativeParent, + #ifdef MOZ_WAYLAND + if (!mIsX11Display && ComputeShouldAccelerate()) { + RefPtr self(this); +- moz_container_set_initial_draw_callback(mContainer, +- [self]() -> void { +- self->WaylandEGLSurfaceForceRedraw(); +- }); ++ moz_container_set_initial_draw_callback(mContainer, [self]() -> void { ++ self->mNeedsUpdatingEGLSurface = true; ++ self->WaylandEGLSurfaceForceRedraw(); ++ }); + } + #endif + +@@ -6058,6 +6064,9 @@ void nsWindow::SetCompositorWidgetDelegate(CompositorWidgetDelegate *delegate) { + MOZ_ASSERT(mCompositorWidgetDelegate, + "nsWindow::SetCompositorWidgetDelegate called with a " + "non-PlatformCompositorWidgetDelegate"); ++#ifdef MOZ_WAYLAND ++ WaylandEGLSurfaceForceRedraw(); ++#endif + } else { + mCompositorWidgetDelegate = nullptr; + } +@@ -6543,8 +6552,7 @@ nsWindow::CSDSupportLevel nsWindow::GetSystemCSDSupportLevel() { + // Check for Mutter regression on X.org (Bug 1530252). In that case we + // don't hide system titlebar by default as we can't draw transparent + // corners reliably. +-bool nsWindow::TitlebarCanUseShapeMask() +-{ ++bool nsWindow::TitlebarCanUseShapeMask() { + static int canUseShapeMask = -1; + if (canUseShapeMask != -1) { + return canUseShapeMask; +@@ -6574,7 +6582,8 @@ bool nsWindow::HideTitlebarByDefault() { + // When user defined widget.default-hidden-titlebar don't do any + // heuristics and just follow it. + if (Preferences::HasUserValue("widget.default-hidden-titlebar")) { +- hideTitlebar = Preferences::GetBool("widget.default-hidden-titlebar", false); ++ hideTitlebar = ++ Preferences::GetBool("widget.default-hidden-titlebar", false); + return hideTitlebar; + } + +diff --git widget/gtk/nsWindow.h widget/gtk/nsWindow.h +index 309905757431..ae2ebd350af4 100644 +--- widget/gtk/nsWindow.h ++++ widget/gtk/nsWindow.h +@@ -433,6 +433,9 @@ class nsWindow final : public nsBaseWidget { + bool mIsDragPopup; + // Can we access X? + bool mIsX11Display; ++#ifdef MOZ_WAYLAND ++ bool mNeedsUpdatingEGLSurface; ++#endif + + private: + void DestroyChildWindows();