Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1369309 - Part 1: Spoofing media statistics to 0 when 'privacy.resistFingerprinting' is true. r=jwwang, r=arthuredelstein

Browse Source 
MozReview-Commit-ID: FNALpUGFDTQ

--HG--
extra : rebase_source : 3ba5bfca6178ffdf15ceeeb66cb17e902e82b15a
This commit is contained in:
Tim Huang 2017-06-19 14:43:26 +08:00
parent ba4b775805
commit a6420be85e
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dom/html/HTMLVideoElement.cpp
View File

@ -151,7 +151,7 @@ HTMLVideoElement::IsInteractiveHTMLContent(bool aIgnoreTabindex) const
uint32_t HTMLVideoElement::MozParsedFrames() const
{
MOZ_ASSERT(NS_IsMainThread(), "Should be on main thread.");
if (!sVideoStatsEnabled) {
if (!IsVideoStatsEnabled()) {
return 0;
}
return mDecoder ? mDecoder->GetFrameStatistics().GetParsedFrames() : 0;
@ -160,7 +160,7 @@ uint32_t HTMLVideoElement::MozParsedFrames() const
uint32_t HTMLVideoElement::MozDecodedFrames() const
{
MOZ_ASSERT(NS_IsMainThread(), "Should be on main thread.");
if (!sVideoStatsEnabled) {
if (!IsVideoStatsEnabled()) {
return 0;
}
return mDecoder ? mDecoder->GetFrameStatistics().GetDecodedFrames() : 0;
@ -169,7 +169,7 @@ uint32_t HTMLVideoElement::MozDecodedFrames() const
uint32_t HTMLVideoElement::MozPresentedFrames() const
{
MOZ_ASSERT(NS_IsMainThread(), "Should be on main thread.");
if (!sVideoStatsEnabled) {
if (!IsVideoStatsEnabled()) {
return 0;
}
return mDecoder ? mDecoder->GetFrameStatistics().GetPresentedFrames() : 0;
@ -178,7 +178,7 @@ uint32_t HTMLVideoElement::MozPresentedFrames() const
uint32_t HTMLVideoElement::MozPaintedFrames()
{
MOZ_ASSERT(NS_IsMainThread(), "Should be on main thread.");
if (!sVideoStatsEnabled) {
if (!IsVideoStatsEnabled()) {
return 0;
}
layers::ImageContainer* container = GetImageContainer();
@ -188,6 +188,10 @@ uint32_t HTMLVideoElement::MozPaintedFrames()
double HTMLVideoElement::MozFrameDelay()
{
MOZ_ASSERT(NS_IsMainThread(), "Should be on main thread.");
if (!IsVideoStatsEnabled()) {
return 0.0;
}
VideoFrameContainer* container = GetVideoFrameContainer();
// Hide negative delays. Frame timing tweaks in the compositor (e.g.
// adding a bias value to prevent multiple dropped/duped frames when
@ -242,7 +246,7 @@ HTMLVideoElement::GetVideoPlaybackQuality()
uint32_t droppedFrames = 0;
uint32_t corruptedFrames = 0;
if (sVideoStatsEnabled) {
if (IsVideoStatsEnabled()) {
if (nsPIDOMWindowInner* window = OwnerDoc()->GetInnerWindow()) {
Performance* perf = window->GetPerformance();
if (perf) {
@ -325,5 +329,11 @@ HTMLVideoElement::Init()
Preferences::AddBoolVarCache(&sVideoStatsEnabled, "media.video_stats.enabled");
}
/* static */
bool
HTMLVideoElement::IsVideoStatsEnabled() {
return sVideoStatsEnabled && !nsContentUtils::ShouldResistFingerprinting();
}
} // namespace dom
} // namespace mozilla

2
dom/html/HTMLVideoElement.h
View File

@ -151,6 +151,8 @@ protected:
private:
static void MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
GenericSpecifiedValues* aGenericData);
static bool IsVideoStatsEnabled();
};
} // namespace dom