From owner-svn-ports-all@freebsd.org Sat Sep 12 00:42:22 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 48B3D3EB34A; Sat, 12 Sep 2020 00:42:22 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BpDNZ1Gh9z45w7; Sat, 12 Sep 2020 00:42:22 +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 0F181C7D9; Sat, 12 Sep 2020 00:42:22 +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 08C0gL6R079256; Sat, 12 Sep 2020 00:42:21 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08C0gLJh079255; Sat, 12 Sep 2020 00:42:21 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202009120042.08C0gLJh079255@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 12 Sep 2020 00:42:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r548274 - in branches/2020Q3/www/firefox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q3/www/firefox: . files X-SVN-Commit-Revision: 548274 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 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: Sat, 12 Sep 2020 00:42:22 -0000 Author: jbeich Date: Sat Sep 12 00:42:21 2020 New Revision: 548274 URL: https://svnweb.freebsd.org/changeset/ports/548274 Log: MFH: r548266 www/firefox: fix tab crashing when not using pulseaudio Submitted by: Ka Ho Ng Approved by: ports-secteam blanket Differential Revision: https://reviews.freebsd.org/D26303 Added: branches/2020Q3/www/firefox/files/patch-bug1664115 - copied unchanged from r548266, head/www/firefox/files/patch-bug1664115 Modified: branches/2020Q3/www/firefox/Makefile Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/www/firefox/Makefile ============================================================================== --- branches/2020Q3/www/firefox/Makefile Sat Sep 12 00:40:17 2020 (r548273) +++ branches/2020Q3/www/firefox/Makefile Sat Sep 12 00:42:21 2020 (r548274) @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 80.0.1 -PORTEPOCH= 1 +PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Copied: branches/2020Q3/www/firefox/files/patch-bug1664115 (from r548266, head/www/firefox/files/patch-bug1664115) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/www/firefox/files/patch-bug1664115 Sat Sep 12 00:42:21 2020 (r548274, copy of r548266, head/www/firefox/files/patch-bug1664115) @@ -0,0 +1,82 @@ +Revert bug 1647717 to workaround the issue of occational tab crashing when +using any cubeb backends other than pulse-rust to play media. The loss of +such change will be that users will not be able to do profiling on threads +created by libcubeb. + +diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp +index 1b62a26ab32b2..35c61f612bf72 100644 +--- dom/media/AudioStream.cpp ++++ dom/media/AudioStream.cpp +@@ -25,7 +25,6 @@ + #endif + #include "Tracing.h" + #include "webaudio/blink/DenormalDisabler.h" +-#include "AudioThreadRegistry.h" + + // Use abort() instead of exception in SoundTouch. + #define ST_NO_EXCEPTION_HANDLING 1 +@@ -138,9 +137,7 @@ + mTimeStretcher(nullptr), + mState(INITIALIZED), + mDataSource(aSource), +- mPrefillQuirk(false), +- mAudioThreadId(0), +- mSandboxed(CubebUtils::SandboxEnabled()) { ++ mPrefillQuirk(false) { + #if defined(XP_WIN) + if (XRE_IsContentProcess()) { + audio::AudioNotificationReceiver::Register(this); +@@ -587,21 +584,7 @@ + aWriter.Available()); + } + +-bool AudioStream::CheckThreadIdChanged() { +-#ifdef MOZ_GECKO_PROFILER +- auto id = profiler_current_thread_id(); +- if (id != mAudioThreadId) { +- mAudioThreadId = id; +- return true; +- } +-#endif +- return false; +-} +- + long AudioStream::DataCallback(void* aBuffer, long aFrames) { +- if (!mSandboxed && CheckThreadIdChanged()) { +- CubebUtils::GetAudioThreadRegistry()->Register(mAudioThreadId); +- } + WebCore::DenormalDisabler disabler; + + TRACE_AUDIO_CALLBACK_BUDGET(aFrames, mAudioClock.GetInputRate()); +@@ -657,9 +640,6 @@ + mDumpFile.Write(static_cast(aBuffer), + aFrames * mOutChannels); + +- if (!mSandboxed && writer.Available() != 0) { +- CubebUtils::GetAudioThreadRegistry()->Unregister(mAudioThreadId); +- } + return aFrames - writer.Available(); + } + +diff --git dom/media/AudioStream.h dom/media/AudioStream.h +index 933e4cb3bfdb5..5d2181e632af9 100644 +--- dom/media/AudioStream.h ++++ dom/media/AudioStream.h +@@ -304,7 +304,6 @@ + + template + int InvokeCubeb(Function aFunction, Args&&... aArgs); +- bool CheckThreadIdChanged(); + + // The monitor is held to protect all access to member variables. + Monitor mMonitor; +@@ -338,9 +337,6 @@ + // the default device is used. It is set + // during the Init() in decoder thread. + RefPtr mSinkInfo; +- /* Contains the id of the audio thread, from profiler_get_thread_id. */ +- std::atomic mAudioThreadId; +- const bool mSandboxed = false; + }; + + } // namespace mozilla