Date: Sun, 15 Jul 2018 04:34:43 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474659 - in head/www/waterfox: . files Message-ID: <201807150434.w6F4Yhk2093060@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Jul 15 04:34:43 2018 New Revision: 474659 URL: https://svnweb.freebsd.org/changeset/ports/474659 Log: www/waterfox: update to 56.2.2 - Apply some FF61 fixes Changes: https://github.com/MrAlex94/Waterfox/compare/6395bf177f76a...56.2.2 Added: head/www/waterfox/files/patch-bug1431285 (contents, props changed) head/www/waterfox/files/patch-bug1472925 (contents, props changed) head/www/waterfox/files/patch-bug1473041 (contents, props changed) Deleted: head/www/waterfox/files/patch-bug1452576 head/www/waterfox/files/patch-bug1458048 head/www/waterfox/files/patch-bug1458270 head/www/waterfox/files/patch-bug1462912 head/www/waterfox/files/patch-bug1463494 head/www/waterfox/files/patch-bug1464079 Modified: head/www/waterfox/Makefile (contents, props changed) head/www/waterfox/distinfo (contents, props changed) Modified: head/www/waterfox/Makefile ============================================================================== --- head/www/waterfox/Makefile Sun Jul 15 03:27:51 2018 (r474658) +++ head/www/waterfox/Makefile Sun Jul 15 04:34:43 2018 (r474659) @@ -1,16 +1,14 @@ # $FreeBSD$ PORTNAME= waterfox -DISTVERSION= 56.2.1-55 -DISTVERSIONSUFFIX= -g6395bf177f76a -PORTREVISION= 3 +DISTVERSION= 56.2.2 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org COMMENT= Distilled fork of Firefox DEPRECATED= Temporary experiment -EXPIRATION_DATE=2018-07-17 +EXPIRATION_DATE=2018-09-27 BUILD_DEPENDS= nspr>=4.16:devel/nspr \ nss>=3.32.1:security/nss \ Modified: head/www/waterfox/distinfo ============================================================================== --- head/www/waterfox/distinfo Sun Jul 15 03:27:51 2018 (r474658) +++ head/www/waterfox/distinfo Sun Jul 15 04:34:43 2018 (r474659) @@ -1,3 +1,3 @@ -TIMESTAMP = 1530543888 -SHA256 (MrAlex94-Waterfox-56.2.1-55-g6395bf177f76a_GH0.tar.gz) = 768ff4628b2f4dcf1868dfae711a10b69d2166c544a1252dd4463c2b596676ec -SIZE (MrAlex94-Waterfox-56.2.1-55-g6395bf177f76a_GH0.tar.gz) = 395130631 +TIMESTAMP = 1531411206 +SHA256 (MrAlex94-Waterfox-56.2.2_GH0.tar.gz) = cdca42bb619f0a4dedf216c78fe965775fd5e6cb14c8b5e677fe264b1f5667b2 +SIZE (MrAlex94-Waterfox-56.2.2_GH0.tar.gz) = 395130444 Added: head/www/waterfox/files/patch-bug1431285 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/waterfox/files/patch-bug1431285 Sun Jul 15 04:34:43 2018 (r474659) @@ -0,0 +1,34 @@ +commit 767fca9e52ef +Author: Bobby Holley <bobbyholley@gmail.com> +Date: Tue Jul 3 23:47:48 2018 +0000 + + Bug 1431285 - Cap the number of style threads at six. r=emilio a=lizzard + + MozReview-Commit-ID: 3qI1mIvDn8j + + Differential Revision: https://phabricator.services.mozilla.com/D1928 + + --HG-- + extra : source : 0d61bbcd24d8eb49d2beea278859da868186f783 +--- + servo/components/style/gecko/global_style_data.rs | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git servo/components/style/gecko/global_style_data.rs servo/components/style/gecko/global_style_data.rs +index f1cb107dff0fa..6671de9867d2f 100644 +--- servo/components/style/gecko/global_style_data.rs ++++ servo/components/style/gecko/global_style_data.rs +@@ -65,7 +65,12 @@ lazy_static! { + .map(|s| s.parse::<usize>().expect("invalid STYLO_THREADS value")); + let mut num_threads = match stylo_threads { + Ok(num) => num, +- _ => cmp::max(num_cpus::get() * 3 / 4, 1), ++ // The default heuristic is num_virtual_cores * .75. This gives us ++ // three threads on a hyper-threaded dual core, and six threads on ++ // a hyper-threaded quad core. The performance benefit of additional ++ // threads seems to level off at around six, so we cap it there on ++ // many-core machines (see bug 1431285 comment 14). ++ _ => cmp::min(cmp::max(num_cpus::get() * 3 / 4, 1), 6), + }; + + // If num_threads is one, there's no point in creating a thread pool, so Added: head/www/waterfox/files/patch-bug1472925 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/waterfox/files/patch-bug1472925 Sun Jul 15 04:34:43 2018 (r474659) @@ -0,0 +1,83 @@ +commit 8ffab3ae0ea3 +Author: Karl Tomlinson <karlt+@karlt.net> +Date: Tue Jul 3 17:23:09 2018 +1200 + + Bug 1472925 - Keep a strong reference to MediaStreamGraph from GraphDriver. r=padenot, a=lizzard +--- + dom/media/GraphDriver.cpp | 7 ++++--- + dom/media/GraphDriver.h | 6 ++---- + dom/media/MediaStreamGraph.cpp | 3 ++- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git dom/media/GraphDriver.cpp dom/media/GraphDriver.cpp +index fd003ac9dbc6a..197debf299582 100644 +--- dom/media/GraphDriver.cpp ++++ dom/media/GraphDriver.cpp +@@ -179,7 +179,8 @@ class MediaStreamGraphInitThreadRunnable : public Runn + NS_IMETHOD Run() override + { + LOG(LogLevel::Debug, +- ("Starting a new system driver for graph %p", mDriver->mGraphImpl)); ++ ("Starting a new system driver for graph %p", ++ mDriver->mGraphImpl.get())); + + RefPtr<GraphDriver> previousDriver; + { +@@ -217,7 +218,7 @@ void + ThreadedDriver::Start() + { + LOG(LogLevel::Debug, +- ("Starting thread for a SystemClockDriver %p", mGraphImpl)); ++ ("Starting thread for a SystemClockDriver %p", mGraphImpl.get())); + Unused << NS_WARN_IF(mThread); + if (!mThread) { // Ensure we haven't already started it + nsCOMPtr<nsIRunnable> event = new MediaStreamGraphInitThreadRunnable(this); +@@ -784,7 +785,7 @@ void + AudioCallbackDriver::Resume() + { + LOG(LogLevel::Debug, +- ("Resuming audio threads for MediaStreamGraph %p", mGraphImpl)); ++ ("Resuming audio threads for MediaStreamGraph %p", mGraphImpl.get())); + if (cubeb_stream_start(mAudioStream) != CUBEB_OK) { + NS_WARNING("Could not start cubeb stream for MSG."); + } +@@ -859,7 +860,7 @@ AudioCallbackDriver::Revive() + } else { + LOG(LogLevel::Debug, + ("Starting audio threads for MediaStreamGraph %p from a new thread.", +- mGraphImpl)); ++ mGraphImpl.get())); + RefPtr<AsyncCubebTask> initEvent = + new AsyncCubebTask(this, AsyncCubebOperation::INIT); + initEvent->Dispatch(); +diff --git dom/media/GraphDriver.h dom/media/GraphDriver.h +index 5c085dc36bff5..ca77b5752569f 100644 +--- dom/media/GraphDriver.h ++++ dom/media/GraphDriver.h +@@ -211,10 +211,8 @@ protected: + // Time of the end of this graph iteration. This must be accessed while having + // the monitor. + GraphTime mIterationEnd; +- // The MediaStreamGraphImpl that owns this driver. This has a lifetime longer +- // than the driver, and will never be null. Hence, it can be accesed without +- // monitor. +- MediaStreamGraphImpl* mGraphImpl; ++ // The MediaStreamGraphImpl associated with this driver. ++ const RefPtr<MediaStreamGraphImpl> mGraphImpl; + + // This is used on the main thread (during initialization), and the graph + // thread. No monitor needed because we know the graph thread does not run +diff --git dom/media/MediaStreamGraph.cpp dom/media/MediaStreamGraph.cpp +index a3c8b26c2663d..4e6175e0d9fed 100644 +--- dom/media/MediaStreamGraph.cpp ++++ dom/media/MediaStreamGraph.cpp +@@ -3661,7 +3661,8 @@ MediaStreamGraphImpl::Destroy() + // First unregister from memory reporting. + UnregisterWeakMemoryReporter(this); + +- // Clear the self reference which will destroy this instance. ++ // Clear the self reference which will destroy this instance if all ++ // associated GraphDrivers are destroyed. + mSelfRef = nullptr; + } + Added: head/www/waterfox/files/patch-bug1473041 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/waterfox/files/patch-bug1473041 Sun Jul 15 04:34:43 2018 (r474659) @@ -0,0 +1,30 @@ +commit 9bfdb471cdb0 +Author: Lee Salzman <lsalzman@mozilla.com> +Date: Thu Jul 12 14:19:07 2018 -0400 + + Bug 1473041 - save and restore PermitSubpixelAA state for basic layer paint callback. r=mstange a=lizzard + + --HG-- + extra : source : e6698ef51a7e2f049350b09d67fa7338d2bd405a +--- + gfx/layers/basic/BasicPaintedLayer.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git gfx/layers/basic/BasicPaintedLayer.cpp gfx/layers/basic/BasicPaintedLayer.cpp +index 7fae4e2e78a67..431a328da95ed 100644 +--- gfx/layers/basic/BasicPaintedLayer.cpp ++++ gfx/layers/basic/BasicPaintedLayer.cpp +@@ -90,9 +90,12 @@ BasicPaintedLayer::PaintThebes(gfxContext* aContext, + context = aContext; + } + if (context) { +- SetAntialiasingFlags(this, context->GetDrawTarget()); ++ DrawTarget* target = context->GetDrawTarget(); ++ bool oldAA = target->GetPermitSubpixelAA(); ++ SetAntialiasingFlags(this, target); + aCallback(this, context, toDraw, toDraw, DrawRegionClip::NONE, + nsIntRegion(), aCallbackData); ++ target->SetPermitSubpixelAA(oldAA); + } + if (needsGroup && availableGroup) { + BasicManager()->PopGroupForLayer(group);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807150434.w6F4Yhk2093060>