From 4a748bd7664640d199c06f6ec64581f25c516fd1 Mon Sep 17 00:00:00 2001
From: Steve Singer <steve@ssinger.info>
Date: Sat, 18 Apr 2015 19:44:00 +0200
Subject: [PATCH] Bug 1141642 - Fix disable-skia builds. r=jmuizelaar

--HG--
extra : rebase_source : 6c6e1664973547b6131a5f5410bb0eec9afd750d
---
 gfx/layers/basic/BasicCompositor.cpp   | 2 +-
 gfx/layers/basic/BasicLayerManager.cpp | 2 +-
 image/src/moz.build                    | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gfx/layers/basic/BasicCompositor.cpp b/gfx/layers/basic/BasicCompositor.cpp
index 17d40d10e7cc..4b2b3061387d 100644
--- a/gfx/layers/basic/BasicCompositor.cpp
+++ b/gfx/layers/basic/BasicCompositor.cpp
@@ -280,7 +280,7 @@ Transform(DataSourceSurface* aDest,
                                                  (uint32_t*)aSource->GetData(),
                                                  aSource->Stride());
 
-  NS_ABORT_IF_FALSE(src && dest, "Failed to create pixman images?");
+  MOZ_ASSERT(src !=0 && dest != 0, "Failed to create pixman images?");
 
   pixman_transform pixTransform = Matrix3DToPixman(aTransform);
   pixman_transform pixTransformInverted;
diff --git a/gfx/layers/basic/BasicLayerManager.cpp b/gfx/layers/basic/BasicLayerManager.cpp
index b9f4caa54bd2..06a2e0077a8b 100644
--- a/gfx/layers/basic/BasicLayerManager.cpp
+++ b/gfx/layers/basic/BasicLayerManager.cpp
@@ -711,7 +711,7 @@ Transform(const gfxImageSurface* aDest,
                                                  (uint32_t*)aSrc->GetData(),
                                                  aSrc->Stride());
 
-  NS_ABORT_IF_FALSE(src && dest, "Failed to create pixman images?");
+  MOZ_ASSERT(src != 0 && dest !=0, "Failed to create pixman images?");
 
   pixman_transform pixTransform = BasicLayerManager_Matrix3DToPixman(aTransform);
   pixman_transform pixTransformInverted;
diff --git a/image/src/moz.build b/image/src/moz.build
index 7c7824079ef8..5f7d8b93c08c 100644
--- a/image/src/moz.build
+++ b/image/src/moz.build
@@ -19,7 +19,6 @@ UNIFIED_SOURCES += [
     'ClippedImage.cpp',
     'DecodePool.cpp',
     'Decoder.cpp',
-    'Downscaler.cpp',
     'DynamicImage.cpp',
     'FrameAnimator.cpp',
     'FrozenImage.cpp',
@@ -39,6 +38,8 @@ UNIFIED_SOURCES += [
     'SVGDocumentWrapper.cpp',
     'VectorImage.cpp',
 ]
+if CONFIG['MOZ_ENABLE_SKIA']:
+    UNIFIED_SOURCES += [ 'Downscaler.cpp']
 
 # These files can't be unified because of ImageLogging.h #include order issues.
 SOURCES += [