Bug 1068613 - Addendum: Fix bustage in ASAN builds. r=bustage on a CLOSED TREE

gfx/layers/d3d11/TextureD3D11.cpp

@@ -289,7 +289,7 @@ TextureClientD3D11::Unlock()
 
     if (FAILED(hr)) {
       gfx::gfxCriticalError() << "[D3D11] CreateTexture2D failure " << mSize << " Code: " << hr;
-      return false;
+      return;
     }
 
     if (SUCCEEDED(hr)) {

gfx/thebes/gfxPlatform.cpp

@@ -61,7 +61,9 @@
 #include "nsILocaleService.h"
 #include "nsIObserverService.h"
 #include "MainThreadUtils.h"
+#ifdef MOZ_CRASHREPORTER
 #include "nsExceptionHandler.h"
+#endif
 
 #include "nsWeakReference.h"
 
@@ -153,7 +155,11 @@ public:
             return;
         }
         nsCString reportString(aString.c_str());
+#ifdef MOZ_CRASHREPORTER
         CrashReporter::AppendAppNotesToCrashReport(reportString);
+#else
+        PR_LogPrint(reportString);
+#endif
     }
 };