Merge pull request #998 from MoonchildProductions/master

Merge master into Sync-weave

1 files changed, 0 insertions, 13 deletions

diff --git a/gfx/src/DriverCrashGuard.cpp b/gfx/src/DriverCrashGuard.cpp
index fd616575b..2303e9d66 100644
--- a/gfx/src/DriverCrashGuard.cpp
+++ b/gfx/src/DriverCrashGuard.cpp
@@ -411,10 +411,6 @@ D3D11LayersCrashGuard::Initialize()
   }

 

   DriverCrashGuard::Initialize();

-

-  // If no telemetry states have been recorded, this will set the state to okay.

-  // Otherwise, it will have no effect.

-  RecordTelemetry(TelemetryState::Okay);

 }

 

 bool

@@ -447,30 +443,21 @@ D3D11LayersCrashGuard::UpdateEnvironment()
     return false;

   }

 

-  RecordTelemetry(TelemetryState::EnvironmentChanged);

   return true;

 }

 

 void

 D3D11LayersCrashGuard::LogCrashRecovery()

 {

-  RecordTelemetry(TelemetryState::RecoveredFromCrash);

   gfxCriticalNote << "D3D11 layers just crashed; D3D11 will be disabled.";

 }

 

 void

 D3D11LayersCrashGuard::LogFeatureDisabled()

 {

-  RecordTelemetry(TelemetryState::FeatureDisabled);

   gfxCriticalNote << "D3D11 layers disabled due to a prior crash.";

 }

 

-void

-D3D11LayersCrashGuard::RecordTelemetry(TelemetryState aState)

-{

-  /* STUB */

-}

-

 D3D9VideoCrashGuard::D3D9VideoCrashGuard(dom::ContentParent* aContentParent)

  : DriverCrashGuard(CrashGuardType::D3D9Video, aContentParent)

 {