Merge branch 'master' into Pale_Moon-release

# Conflicts:
#	application/palemoon/config/version.txt
#	js/src/jit/x86-shared/AssemblerBuffer-x86-shared.h
#	toolkit/components/search/orginal/nsSearchService.js

1 files changed, 1 insertions, 13 deletions

diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index a988859eb..b1ede7ad2 100755
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -430,10 +430,6 @@ gfxWindowsPlatform::HandleDeviceReset()
     return false;
   }
 
-  if (resetReason != DeviceResetReason::FORCED_RESET) {
-    Telemetry::Accumulate(Telemetry::DEVICE_RESET_REASON, uint32_t(resetReason));
-  }
-
   // Remove devices and adapters.
   DeviceManagerDx::Get()->ResetDevices();
 
@@ -1442,15 +1438,7 @@ gfxWindowsPlatform::InitializeD3D11Config()
 /* static */ void
 gfxWindowsPlatform::RecordContentDeviceFailure(TelemetryDeviceCode aDevice)
 {
-  // If the parent process fails to acquire a device, we record this
-  // normally as part of the environment. The exceptional case we're
-  // looking for here is when the parent process successfully acquires
-  // a device, but the content process fails to acquire the same device.
-  // This would not normally be displayed in about:support.
-  if (!XRE_IsContentProcess()) {
-    return;
-  }
-  Telemetry::Accumulate(Telemetry::GFX_CONTENT_FAILED_TO_ACQUIRE_DEVICE, uint32_t(aDevice));
+  /* STUB */
 }
 
 void