Pull D3D11 logic out of DriverCrashGuard. (bug 1190281 part 4, r=mattwoodrow)

gfx/src/DriverCrashGuard.cpp

@@ -20,8 +20,6 @@
 namespace mozilla {
 namespace gfx {
 
-bool DriverCrashGuard::sEnvironmentHasBeenUpdated = false;
-
 DriverCrashGuard::DriverCrashGuard()
  : mInitialized(false)
  , mIsChromeProcess(XRE_GetProcessType() == GeckoProcessType_Default)
@@ -42,12 +40,6 @@ DriverCrashGuard::InitializeIfNeeded()
 void
 DriverCrashGuard::Initialize()
 {
-  if (!mIsChromeProcess) {
-    // We assume the parent process already performed crash detection for
-    // graphics devices.
-    return;
-  }
-
   if (!InitLockFilePath()) {
     gfxCriticalError(CriticalLog::DefaultOptions(false)) << "Failed to create the graphics startup lockfile.";
     return;
@@ -60,13 +52,11 @@ DriverCrashGuard::Initialize()
     return;
   }
 
-  if (UpdateEnvironment() || sEnvironmentHasBeenUpdated) {
+  if (PrepareToGuard()) {
     // Something in the environment changed, *or* a previous instance of this
-    // class already updated the environment. Allow a fresh attempt at driver
-    // acceleration. This doesn't mean the previous attempt failed, it just
-    // means we want to detect whether the new environment crashes.
+    // class already updated the environment in this session. Enable the
+    // guard.
     AllowDriverInitAttempt();
-    sEnvironmentHasBeenUpdated = true;
     return;
   }
 
@@ -164,13 +154,28 @@ DriverCrashGuard::RecoverFromDriverInitCrash()
   return false;
 }
 
+// Return true if the caller should proceed to guard for crashes. False if
+// the environment has not changed.
 bool
-DriverCrashGuard::UpdateEnvironment()
+DriverCrashGuard::PrepareToGuard()
 {
-  mGfxInfo = services::GetGfxInfo();
+  static bool sBaseInfoChanged = false;
+  static bool sBaseInfoChecked = false;
 
+  if (!sBaseInfoChecked) {
+    sBaseInfoChecked = true;
+    sBaseInfoChanged = UpdateBaseEnvironment();
+  }
+
+  // Always update the full environment, even if the base info didn't change.
+  return UpdateEnvironment() || sBaseInfoChanged;
+}
+
+bool
+DriverCrashGuard::UpdateBaseEnvironment()
+{
   bool changed = false;
-  if (mGfxInfo) {
+  if (mGfxInfo = services::GetGfxInfo()) {
     nsString value;
 
     // Driver properties.
@@ -178,27 +183,11 @@ DriverCrashGuard::UpdateEnvironment()
     changed |= CheckAndUpdatePref("gfx.driver-init.driverVersion", value);
     mGfxInfo->GetAdapterDeviceID(value);
     changed |= CheckAndUpdatePref("gfx.driver-init.deviceID", value);
-
-    // Feature status.
-#if defined(XP_WIN)
-    bool d2dEnabled = gfxPrefs::Direct2DForceEnabled() ||
-                      (!gfxPrefs::Direct2DDisabled() && FeatureEnabled(nsIGfxInfo::FEATURE_DIRECT2D));
-    changed |= CheckAndUpdateBoolPref("gfx.driver-init.feature-d2d", d2dEnabled);
-
-    bool d3d11Enabled = !gfxPrefs::LayersPreferD3D9();
-    if (!FeatureEnabled(nsIGfxInfo::FEATURE_DIRECT3D_11_LAYERS)) {
-      d3d11Enabled = false;
-    }
-    changed |= CheckAndUpdateBoolPref("gfx.driver-init.feature-d3d11", d3d11Enabled);
-#endif
   }
 
   // Firefox properties.
   changed |= CheckAndUpdatePref("gfx.driver-init.appVersion", NS_LITERAL_STRING(MOZ_APP_VERSION));
 
-  // Finally, mark as changed if the status has been reset by the user.
-  changed |= (gfxPrefs::DriverInitStatus() == int32_t(DriverInitStatus::None));
-
   return changed;
 }
 
@@ -246,6 +235,61 @@ DriverCrashGuard::FlushPreferences()
 
 void
 DriverCrashGuard::RecordTelemetry(TelemetryState aState)
+{
+  // No default telemetry handling yet.
+}
+
+D3D11LayersCrashGuard::D3D11LayersCrashGuard()
+{
+}
+
+void
+D3D11LayersCrashGuard::Initialize()
+{
+  if (!mIsChromeProcess) {
+    // We assume the parent process already performed crash detection for
+    // graphics devices.
+    return;
+  }
+
+  DriverCrashGuard::Initialize();
+}
+
+bool
+D3D11LayersCrashGuard::UpdateEnvironment()
+{
+  static bool checked = false;
+  static bool changed = false;
+
+  if (checked) {
+    return changed;
+  }
+
+  checked = true;
+
+  if (mGfxInfo) {
+    // Feature status.
+#if defined(XP_WIN)
+    bool d2dEnabled = gfxPrefs::Direct2DForceEnabled() ||
+                      (!gfxPrefs::Direct2DDisabled() && FeatureEnabled(nsIGfxInfo::FEATURE_DIRECT2D));
+    changed |= CheckAndUpdateBoolPref("gfx.driver-init.feature-d2d", d2dEnabled);
+
+    bool d3d11Enabled = !gfxPrefs::LayersPreferD3D9();
+    if (!FeatureEnabled(nsIGfxInfo::FEATURE_DIRECT3D_11_LAYERS)) {
+      d3d11Enabled = false;
+    }
+    changed |= CheckAndUpdateBoolPref("gfx.driver-init.feature-d3d11", d3d11Enabled);
+#endif
+  }
+
+  // Finally, mark as changed if the status has been reset by the user.
+  changed |= (gfxPrefs::DriverInitStatus() == int32_t(DriverInitStatus::None));
+
+  return changed;
+}
+
+void
+D3D11LayersCrashGuard::RecordTelemetry(TelemetryState aState)
 {
   // Since we run this in each child process, we only want the initial results
   // from the chrome process.

gfx/src/DriverCrashGuard.h

@@ -54,28 +54,43 @@ public:
     AccelerationDisabled = 3
   };
 
-private:
-  void InitializeIfNeeded();
-  void Initialize();
-  bool InitLockFilePath();
-  bool UpdateEnvironment();
+protected:
+  virtual void RecordTelemetry(TelemetryState aState);
+  virtual bool UpdateEnvironment() = 0;
+  virtual void Initialize() = 0;
+
+  // Helper functions.
+  bool FeatureEnabled(int aFeature);
   bool CheckAndUpdatePref(const char* aPrefName, const nsAString& aCurrentValue);
   bool CheckAndUpdateBoolPref(const char* aPrefName, bool aCurrentValue);
-  bool FeatureEnabled(int aFeature);
+
+private:
+  void InitializeIfNeeded();
+  bool InitLockFilePath();
   void AllowDriverInitAttempt();
   bool RecoverFromDriverInitCrash();
   void FlushPreferences();
-
-  void RecordTelemetry(TelemetryState aState);
-
-private:
-  static bool sEnvironmentHasBeenUpdated;
+  bool PrepareToGuard();
+  bool UpdateBaseEnvironment();
 
 private:
   bool mInitialized;
+  nsCOMPtr<nsIFile> mLockFile;
+
+protected:
   bool mIsChromeProcess;
   nsCOMPtr<nsIGfxInfo> mGfxInfo;
-  nsCOMPtr<nsIFile> mLockFile;
+};
+
+class D3D11LayersCrashGuard final : public DriverCrashGuard
+{
+ public:
+  D3D11LayersCrashGuard();
+
+ protected:
+  void Initialize() override;
+  bool UpdateEnvironment() override;
+  void RecordTelemetry(TelemetryState aState) override;
 };
 
 } // namespace gfx

gfx/thebes/gfxWindowsPlatform.cpp

@@ -2183,7 +2183,7 @@ gfxWindowsPlatform::InitializeDevices()
   // If we previously crashed initializing devices, bail out now. This is
   // effectively a parent-process only check, since the content process
   // cannot create a lock file.
-  DriverCrashGuard detectCrashes;
+  D3D11LayersCrashGuard detectCrashes;
   if (detectCrashes.Crashed()) {
     mAcceleration = FeatureStatus::Blocked;
     return;