Switch SkJpegCode to libjpeg-turbo

src/images/SkImageDecoder_libjpeg.cpp

Index: src/images/SkImageDecoder_libjpeg.cpp
diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
index f868de4b4363c9c163828aea7adbeb09b293c784..4ddb0349456ba5133bc1a481efa605f221805de7 100644
--- a/src/images/SkImageDecoder_libjpeg.cpp
+++ b/src/images/SkImageDecoder_libjpeg.cpp
@@ -85,7 +85,7 @@ static void initialize_info(jpeg_decompress_struct* cinfo, skjpeg_source_mgr* sr
     }
 }
 
-#ifdef SK_BUILD_FOR_ANDROID
+#if 0

[scroggo, 2015/06/16 20:39:23]

Derek knows the magic to make SkCodec using libjpeg-turbo while SkImageDecoder
uses libjpeg. With that magic, you don't need to disable this. (The CL to do
something similar for libpng is here:
https://codereview.chromium.org/1058823002/)

[msarett, 2015/06/18 21:06:10]

Done.

 class SkJPEGImageIndex {
 public:
     // Takes ownership of stream.
@@ -203,7 +203,7 @@ private:
 
 class SkJPEGImageDecoder : public SkImageDecoder {
 public:
-#ifdef SK_BUILD_FOR_ANDROID
+#if 0
     SkJPEGImageDecoder() {
         fImageIndex = NULL;
         fImageWidth = 0;
@@ -220,7 +220,7 @@ public:
     }
 
 protected:
-#ifdef SK_BUILD_FOR_ANDROID
+#if 0
     bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) override;
     bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) override;
 #endif
@@ -230,7 +230,7 @@ protected:
                             SkYUVColorSpace* colorSpace) override;
 
 private:
-#ifdef SK_BUILD_FOR_ANDROID
+#if 0
     SkJPEGImageIndex* fImageIndex;
     int fImageWidth;
     int fImageHeight;
@@ -297,7 +297,7 @@ static bool skip_src_rows(jpeg_decompress_struct* cinfo, void* buffer, int count
     return true;
 }
 
-#ifdef SK_BUILD_FOR_ANDROID
+#if 0
 static bool skip_src_rows_tile(jpeg_decompress_struct* cinfo,
                                huffman_index *index, void* buffer, int count) {
     for (int i = 0; i < count; i++) {
@@ -331,7 +331,7 @@ static bool return_false(const jpeg_decompress_struct& cinfo,
     return false;
 }
 
-#ifdef SK_BUILD_FOR_ANDROID
+#if 0
 static bool return_false(const jpeg_decompress_struct& cinfo,
                          const SkBitmap& bm, const char caller[]) {
     print_jpeg_decoder_errors(cinfo, bm.width(), bm.height(), caller);
@@ -941,7 +941,7 @@ bool SkJPEGImageDecoder::onDecodeYUV8Planes(SkStream* stream, SkISize componentS
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef SK_BUILD_FOR_ANDROID
+#if 0
 bool SkJPEGImageDecoder::onBuildTileIndex(SkStreamRewindable* stream, int *width, int *height) {
 
     SkAutoTDelete<SkJPEGImageIndex> imageIndex(SkNEW_ARGS(SkJPEGImageIndex, (stream, this)));