From ce2df25b7719c2451df52ad5256a548cfbaf2f51 Mon Sep 17 00:00:00 2001
From: Arthur Edelstein <arthuredelstein@gmail.com>
Date: Thu, 27 Apr 2017 15:00:14 -0700
Subject: [PATCH] Bug 21792: Suppress MediaError.message when
 privacy.resistFingerprinting = true

---
 dom/html/MediaError.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dom/html/MediaError.cpp b/dom/html/MediaError.cpp
index 83b9ffc5fe5ac..fae098157d9b7 100644
--- a/dom/html/MediaError.cpp
+++ b/dom/html/MediaError.cpp
@@ -7,6 +7,7 @@
 #include "mozilla/dom/MediaError.h"
 #include "nsDOMClassInfoID.h"
 #include "mozilla/dom/MediaErrorBinding.h"
+#include "nsContentUtils.h"
 
 namespace mozilla {
 namespace dom {
@@ -31,7 +32,12 @@ MediaError::MediaError(HTMLMediaElement* aParent, uint16_t aCode,
 void
 MediaError::GetMessage(nsAString& aResult) const
 {
-  CopyUTF8toUTF16(mMessage, aResult);
+  if (nsContentUtils::IsCallerChrome() ||
+      !nsContentUtils::ShouldResistFingerprinting()) {
+    CopyUTF8toUTF16(mMessage, aResult);
+  } else {
+    aResult.Truncate();
+  }
 }
 
 JSObject*
-- 
GitLab