Bug 1068613 - Addendum: Fix bustage in ASAN builds. r=bustage on a CLOSED TREE
authorBas Schouten <bschouten@mozilla.com>
Thu, 18 Sep 2014 00:25:23 +0200
changeset 205918 9a082ef1223af6141df14cdfeba22f1966da0bee
parent 205917 46859d329455a936a3dca1e0983a47e737b798c4
child 205919 40efa924899c1612c41c0aafc6f2ce97547b80db
push id27507
push userryanvm@gmail.com
push dateThu, 18 Sep 2014 02:16:54 +0000
treeherdermozilla-central@488d490da742 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1068613
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1068613 - Addendum: Fix bustage in ASAN builds. r=bustage on a CLOSED TREE
gfx/layers/d3d11/TextureD3D11.cpp
gfx/thebes/gfxPlatform.cpp
--- a/gfx/layers/d3d11/TextureD3D11.cpp
+++ b/gfx/layers/d3d11/TextureD3D11.cpp
@@ -284,17 +284,17 @@ TextureClientD3D11::Unlock()
     desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ;
     desc.MiscFlags = 0;
 
     RefPtr<ID3D10Texture2D> tex;
     HRESULT hr = device->CreateTexture2D(&desc, nullptr, byRef(tex));
 
     if (FAILED(hr)) {
       gfx::gfxCriticalError() << "[D3D11] CreateTexture2D failure " << mSize << " Code: " << hr;
-      return false;
+      return;
     }
 
     if (SUCCEEDED(hr)) {
       device->CopyResource(tex, mTexture10);
 
       gfxWindowsPlatform::GetPlatform()->GetReadbackManager()->PostTask(tex, mReadbackSink);
     } else {
       mReadbackSink->ProcessReadback(nullptr);
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -56,17 +56,19 @@
 #include "gfxGradientCache.h"
 
 #include "nsUnicodeRange.h"
 #include "nsServiceManagerUtils.h"
 #include "nsTArray.h"
 #include "nsILocaleService.h"
 #include "nsIObserverService.h"
 #include "MainThreadUtils.h"
+#ifdef MOZ_CRASHREPORTER
 #include "nsExceptionHandler.h"
+#endif
 
 #include "nsWeakReference.h"
 
 #include "cairo.h"
 #include "qcms.h"
 
 #include "plstr.h"
 #include "nsCRT.h"
@@ -148,17 +150,21 @@ public:
 class CrashStatsLogForwarder: public mozilla::gfx::LogForwarder
 {
 public:
     virtual void Log(const std::string& aString) MOZ_OVERRIDE {
         if (!NS_IsMainThread()) {
             return;
         }
         nsCString reportString(aString.c_str());
+#ifdef MOZ_CRASHREPORTER
         CrashReporter::AppendAppNotesToCrashReport(reportString);
+#else
+        PR_LogPrint(reportString);
+#endif
     }
 };
 
 NS_IMPL_ISUPPORTS(SRGBOverrideObserver, nsIObserver, nsISupportsWeakReference)
 
 #define GFX_DOWNLOADABLE_FONTS_ENABLED "gfx.downloadable_fonts.enabled"
 
 #define GFX_PREF_FALLBACK_USE_CMAPS  "gfx.font_rendering.fallback.always_use_cmaps"