From b68c36a5dac96b40dc8090652c2b264685d73251 Mon Sep 17 00:00:00 2001 From: sanketh Date: Mon, 7 Sep 2020 03:23:36 +0000 Subject: [PATCH] Bug 1461454 - In RFP Mode, Spoof Smooth=True and PowerEfficient=False for Supported Media in MediaCapabilities r=jya Uplifts Tor Browser patch for Tor Bug 13543 and adds a test. Differential Revision: https://phabricator.services.mozilla.com/D89044 --- .../mediacapabilities/MediaCapabilities.cpp | 5 ++ dom/media/test/mochitest.ini | 1 + ...ediacapabilities_resistfingerprinting.html | 69 +++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 dom/media/test/test_mediacapabilities_resistfingerprinting.html diff --git a/dom/media/mediacapabilities/MediaCapabilities.cpp b/dom/media/mediacapabilities/MediaCapabilities.cpp index 9f2b0d8463ff..f25f3a0dd0cf 100644 --- a/dom/media/mediacapabilities/MediaCapabilities.cpp +++ b/dom/media/mediacapabilities/MediaCapabilities.cpp @@ -288,6 +288,11 @@ already_AddRefed MediaCapabilities::DecodingInfo( if (aValue.IsReject()) { p = CapabilitiesPromise::CreateAndReject( std::move(aValue.RejectValue()), __func__); + } else if (nsContentUtils::ShouldResistFingerprinting()) { + p = CapabilitiesPromise::CreateAndResolve( + MediaCapabilitiesInfo(true /* supported */, + true /* smooth */, false /* power efficient */), + __func__); } else { MOZ_ASSERT(config->IsVideo()); if (StaticPrefs::media_mediacapabilities_from_database()) { diff --git a/dom/media/test/mochitest.ini b/dom/media/test/mochitest.ini index 27d5f73aabb7..9eb8a0d7fcb7 100644 --- a/dom/media/test/mochitest.ini +++ b/dom/media/test/mochitest.ini @@ -883,6 +883,7 @@ scheme=https [test_looping_eventsOrder.html] [test_media_selection.html] [test_media_sniffer.html] +[test_mediacapabilities_resistfingerprinting.html] [test_mediarecorder_avoid_recursion.html] skip-if = os == 'win' && !debug scheme=https diff --git a/dom/media/test/test_mediacapabilities_resistfingerprinting.html b/dom/media/test/test_mediacapabilities_resistfingerprinting.html new file mode 100644 index 000000000000..1f07d1c707e7 --- /dev/null +++ b/dom/media/test/test_mediacapabilities_resistfingerprinting.html @@ -0,0 +1,69 @@ + + + + + Test for Bug 1369309 + + + + + +Mozilla Bug 1461454 +Tor Issue 13543 + + + +