mozilla-central: changeset 410729:35db8e10d775fc8b6740f17a5d10d0d532c4ccf6

author	Tom Ritter <tom@mozilla.com>
	Mon, 26 Mar 2018 23:48:35 -0500
changeset 410729	35db8e10d775fc8b6740f17a5d10d0d532c4ccf6
parent 410728	deee0d19a09095d3c5b8f833ae81c16f3870be0b
child 410730	1caa3b80f1faf1c0fe5cc30ff572df340280b9a4
push id	33735
push user	shindli@mozilla.com
push date	Fri, 30 Mar 2018 09:55:46 +0000
treeherder	mozilla-central@3f37287132bf [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jgilbert
bugs	1337157
milestone	61.0a1
first release with	nightly linux32 b7fa9d95150e / 61.0a1 / 20180330100123 / files nightly linux64 b7fa9d95150e / 61.0a1 / 20180330100123 / files nightly mac b7fa9d95150e / 61.0a1 / 20180330100123 / files nightly win32 b7fa9d95150e / 61.0a1 / 20180330100123 / files nightly win64 b7fa9d95150e / 61.0a1 / 20180330100123 / files
last release without	nightly linux32 dcd10220d55a / 61.0a1 / 20180329222832 / files nightly linux64 dcd10220d55a / 61.0a1 / 20180329222832 / files nightly mac dcd10220d55a / 61.0a1 / 20180329222832 / files nightly win32 dcd10220d55a / 61.0a1 / 20180329222832 / files nightly win64 dcd10220d55a / 61.0a1 / 20180329222832 / files

--- a/dom/canvas/WebGLContextExtensions.cpp
+++ b/dom/canvas/WebGLContextExtensions.cpp
@@ -140,17 +140,18 @@ WebGLContext::IsExtensionSupported(WebGL
                !gl->IsANGLE();
     case WebGLExtensionID::WEBGL_compressed_texture_pvrtc:
         return gl->IsExtensionSupported(gl::GLContext::IMG_texture_compression_pvrtc);
     case WebGLExtensionID::WEBGL_compressed_texture_s3tc:
         return WebGLExtensionCompressedTextureS3TC::IsSupported(this);
     case WebGLExtensionID::WEBGL_compressed_texture_s3tc_srgb:
         return WebGLExtensionCompressedTextureS3TC_SRGB::IsSupported(this);
     case WebGLExtensionID::WEBGL_debug_renderer_info:
-        return Preferences::GetBool("webgl.enable-debug-renderer-info", false);
+        return Preferences::GetBool("webgl.enable-debug-renderer-info", false) &&
+               !nsContentUtils::ShouldResistFingerprinting();
     case WebGLExtensionID::WEBGL_debug_shaders:
         return !nsContentUtils::ShouldResistFingerprinting();
     case WebGLExtensionID::WEBGL_lose_context:
         // We always support this extension.
         return true;
 
     default:
         // For warnings-as-errors.