From d525be7d2f38f603cc8b307f0919ce876a02466f Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sat, 12 Aug 2017 04:31:21 +0000
Subject: [PATCH] Bug 1389733 - Add missing Skia compile guards. r=lsalzman

MozReview-Commit-ID: BXYxGjj0j73

--HG--
extra : rebase_source : dc54b6f513468879a2aeb8f298f1b920572c6402
---
 gfx/2d/ScaledFontBase.cpp | 5 ++++-
 image/Downscaler.h        | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gfx/2d/ScaledFontBase.cpp b/gfx/2d/ScaledFontBase.cpp
index dfcd021314e9..5fb7bcf56443 100644
--- a/gfx/2d/ScaledFontBase.cpp
+++ b/gfx/2d/ScaledFontBase.cpp
@@ -175,6 +175,7 @@ ScaledFontBase::GetPathForGlyphs(const GlyphBuffer &aBuffer, const DrawTarget *a
   path->StreamToSink(builder);
   return builder->Finish();
 #endif
+  return nullptr;
 }
 
 void
@@ -218,14 +219,16 @@ ScaledFontBase::CopyGlyphsToBuilder(const GlyphBuffer &aBuffer, PathBuilder *aBu
     cairoPath->AppendPathToBuilder(builder);
     return;
   }
+#endif
+#ifdef USE_SKIA
   if (backendType == BackendType::RECORDING) {
     SkPath skPath = GetSkiaPathForGlyphs(aBuffer);
     RefPtr<Path> path = MakeAndAddRef<PathSkia>(skPath, FillRule::FILL_WINDING);
     path->StreamToSink(aBuilder);
     return;
   }
-  MOZ_ASSERT(false, "Path not being copied");
 #endif
+  MOZ_ASSERT(false, "Path not being copied");
 }
 
 void
diff --git a/image/Downscaler.h b/image/Downscaler.h
index 300fa86368f7..943beacc7a75 100644
--- a/image/Downscaler.h
+++ b/image/Downscaler.h
@@ -16,7 +16,9 @@
 #include "mozilla/UniquePtr.h"
 #include "gfxPoint.h"
 #include "nsRect.h"
+#ifdef MOZ_ENABLE_SKIA
 #include "mozilla/gfx/ConvolutionFilter.h"
+#endif
 
 namespace mozilla {
 namespace image {