This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch geckoview-99.0.1-11.0-1 in repository tor-browser. commit 2cebb9230ee35494ab6953ebf6c1818807c9339c Author: Florian Quèze <florian@queze.net> AuthorDate: Tue Mar 1 23:37:14 2022 +0000 Bug 1757534 - disable FOG IPCs in GMP processes on Windows Arm64, r=chutten. a=pascalc Differential Revision: https://phabricator.services.mozilla.com/D139996 --- dom/media/gmp/GMPChild.cpp | 2 ++ toolkit/components/glean/ipc/FOGIPC.cpp | 2 ++ toolkit/components/glean/tests/browser/browser.ini | 1 + 3 files changed, 5 insertions(+) diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp index f5ea5273caaa4..e094138da2ecc 100644 --- a/dom/media/gmp/GMPChild.cpp +++ b/dom/media/gmp/GMPChild.cpp @@ -588,9 +588,11 @@ void GMPChild::ActorDestroy(ActorDestroyReason aWhy) { ProcessChild::QuickExit(); } +#if !defined(XP_WIN) || !defined(_ARM64_) // Send the last bits of Glean data over to the main process. glean::FlushFOGData( [](ByteBuf&& aBuf) { glean::SendFOGData(std::move(aBuf)); }); +#endif if (mProfilerController) { mProfilerController->Shutdown(); diff --git a/toolkit/components/glean/ipc/FOGIPC.cpp b/toolkit/components/glean/ipc/FOGIPC.cpp index 47eb950dbcad6..f4f6072647d72 100644 --- a/toolkit/components/glean/ipc/FOGIPC.cpp +++ b/toolkit/components/glean/ipc/FOGIPC.cpp @@ -185,6 +185,7 @@ void FlushAllChildData( promises.EmplaceBack(socketParent->SendFlushFOGData()); } +#if !defined(XP_WIN) || !defined(_ARM64_) { RefPtr<gmp::GeckoMediaPluginServiceParent> gmps( gmp::GeckoMediaPluginServiceParent::GetSingleton()); @@ -194,6 +195,7 @@ void FlushAllChildData( // GeckoMediaPluginServiceParent code do it for us. gmps->SendFlushFOGData(promises); } +#endif if (RefPtr<UtilityProcessManager> utilityManager = UtilityProcessManager::GetSingleton()) { diff --git a/toolkit/components/glean/tests/browser/browser.ini b/toolkit/components/glean/tests/browser/browser.ini index cd94c509539bf..b35d9f901a92b 100644 --- a/toolkit/components/glean/tests/browser/browser.ini +++ b/toolkit/components/glean/tests/browser/browser.ini @@ -4,6 +4,7 @@ support-files = [browser_fog_gmp.js] support-files = empty_file.html +skip-if = (os == 'win' && processor == 'aarch64') # bug 1757534 [browser_fog_gpu.js] -- To stop receiving notification emails like this one, please contact the administrator of this repository.