Delete SkDecodingImageGenerator

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1692053002

Review URL: https://codereview.chromium.org/1692053002

6 files changed, 121 insertions, 1745 deletions

diff --git a/gyp/images.gyp b/gyp/images.gyp
index 1c434ae9bf..8dbca85153 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -30,7 +30,6 @@
         '../src/image/',
       ],
       'sources': [
-        '../include/images/SkDecodingImageGenerator.h',
         '../include/images/SkForceLinking.h',
         '../src/images/SkJpegUtility.h',
         '../include/images/SkMovie.h',
@@ -39,7 +38,6 @@
         '../src/images/bmpdecoderhelper.cpp',
         '../src/images/bmpdecoderhelper.h',
 
-        '../src/images/SkDecodingImageGenerator.cpp',
         '../src/images/SkForceLinking.cpp',
         '../src/images/SkImageDecoder.cpp',
         '../src/images/SkImageDecoder_FactoryDefault.cpp',
diff --git a/include/images/SkDecodingImageGenerator.h b/include/images/SkDecodingImageGenerator.h
deleted file mode 100644
index 0a5ec56fe8..0000000000
--- a/include/images/SkDecodingImageGenerator.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkDecodingImageGenerator_DEFINED
-#define SkDecodingImageGenerator_DEFINED
-
-#include "SkBitmap.h"
-#include "SkImageGenerator.h"
-
-class SkData;
-class SkStreamRewindable;
-
-/**
- *  An implementation of SkImageGenerator that calls into
- *  SkImageDecoder.
- */
-namespace SkDecodingImageGenerator {
-    /**
-     *  These options will be passed on to the image decoder.  The
-     *  defaults are sensible.
-     *
-     *  @param fSampleSize If set to > 1, tells the decoder to return a
-     *         smaller than original bitmap, sampling 1 pixel for
-     *         every size pixels. e.g. if sample size is set to 3,
-     *         then the returned bitmap will be 1/3 as wide and high,
-     *         and will contain 1/9 as many pixels as the original.
-     *         Note: this is a hint, and the codec may choose to
-     *         ignore this, or only approximate the sample size.
-     *
-     *  @param fDitherImage Set to true if the the decoder should try to
-     *         dither the resulting image when decoding to a smaller
-     *         color-space.  The default is true.
-     *
-     *  @param fRequestedColorType If not given, then use whichever
-     *         config the decoder wants.  Else try to use this color
-     *         type.  If the decoder won't support this color type,
-     *         SkDecodingImageGenerator::Create will return
-     *         NULL. kIndex_8_SkColorType is not supported.
-     *
-     *  @param fRequireUnpremul If true, the decoder will attempt to
-     *         decode without premultiplying the alpha. If it cannot,
-     *         the pixels will be set to NULL.
-     */
-    struct Options {
-        Options()
-            : fSampleSize(1)
-            , fDitherImage(true)
-            , fUseRequestedColorType(false)
-            , fRequestedColorType()
-            , fRequireUnpremul(false) { }
-        Options(int sampleSize, bool dither)
-            : fSampleSize(sampleSize)
-            , fDitherImage(dither)
-            , fUseRequestedColorType(false)
-            , fRequestedColorType()
-            , fRequireUnpremul(false) { }
-        Options(int sampleSize, bool dither, SkColorType colorType)
-            : fSampleSize(sampleSize)
-            , fDitherImage(dither)
-            , fUseRequestedColorType(true)
-            , fRequestedColorType(colorType)
-            , fRequireUnpremul(false) { }
-         Options(int sampleSize, bool dither, SkColorType colorType,
-                 bool requireUnpremul)
-            : fSampleSize(sampleSize)
-            , fDitherImage(dither)
-            , fUseRequestedColorType(true)
-            , fRequestedColorType(colorType)
-            , fRequireUnpremul(requireUnpremul) { }
-        const int         fSampleSize;
-        const bool        fDitherImage;
-        const bool        fUseRequestedColorType;
-        const SkColorType fRequestedColorType;
-        const bool        fRequireUnpremul;
-    };
-
-    /**
-     *  These two functions return a SkImageGenerator that calls into
-     *  SkImageDecoder.  They return NULL on failure.
-     *
-     *  The SkData version of this function is preferred.  If the stream
-     *  has an underlying SkData (such as a SkMemoryStream) pass that in.
-     *
-     *  This object, if non-NULL, takes ownership of stream and deletes stream
-     *  upon deletion. If NULL is returned, stream is deleted immediately.
-     *
-     *  @param Options (see above)
-     *
-     *  @return NULL on failure, a new SkImageGenerator on success.
-     */
-    SkImageGenerator* Create(SkStreamRewindable* stream,
-                             const Options& opt);
-
-    /**
-     *  @param data Contains the encoded image data that will be used by
-     *         the SkDecodingImageGenerator.  Will be ref()ed by the
-     *         SkImageGenerator constructor and and unref()ed on deletion.
-     */
-    SkImageGenerator* Create(SkData* data, const Options& opt);
-};
-
-//  // Example of most basic use case:
-//
-//  bool install_data(SkData* data, SkBitmap* dst) {
-//     return SkInstallDiscardablePixelRef(
-//         SkDecodingImageGenerator::Create(
-//             data, SkDecodingImageGenerator::Options()), dst, NULL);
-//  }
-//  bool install_stream(SkStreamRewindable* stream, SkBitmap* dst) {
-//     return SkInstallDiscardablePixelRef(
-//         SkDecodingImageGenerator::Create(
-//             stream, SkDecodingImageGenerator::Options()), dst, NULL);
-//  }
-
-#endif  // SkDecodingImageGenerator_DEFINED
diff --git a/src/images/SkDecodingImageGenerator.cpp b/src/images/SkDecodingImageGenerator.cpp
deleted file mode 100644
index 8d55bd36c7..0000000000
--- a/src/images/SkDecodingImageGenerator.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkData.h"
-#include "SkDecodingImageGenerator.h"
-#include "SkImageDecoder.h"
-#include "SkImageInfo.h"
-#include "SkImageGenerator.h"
-#include "SkImagePriv.h"
-#include "SkStream.h"
-#include "SkUtils.h"
-
-namespace {
-bool equal_modulo_alpha(const SkImageInfo& a, const SkImageInfo& b) {
-    return a.width() == b.width() && a.height() == b.height() &&
-           a.colorType() == b.colorType();
-}
-
-class DecodingImageGenerator : public SkImageGenerator {
-public:
-    virtual ~DecodingImageGenerator();
-
-    SkData*                             fData;
-    SkAutoTDelete<SkStreamRewindable>   fStream;
-    const SkImageInfo                   fInfo;
-    const int                           fSampleSize;
-    const bool                          fDitherImage;
-
-    DecodingImageGenerator(SkData* data,
-                           SkStreamRewindable* stream,
-                           const SkImageInfo& info,
-                           int sampleSize,
-                           bool ditherImage);
-
-protected:
-    SkData* onRefEncodedData(SK_REFENCODEDDATA_CTXPARAM) override;
-    bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
-                     SkPMColor ctable[], int* ctableCount) override;
-    bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
-                         SkYUVColorSpace* colorSpace) override;
-
-private:
-    typedef SkImageGenerator INHERITED;
-};
-
-/**
- *  Special allocator used by getPixels(). Uses preallocated memory
- *  provided if possible, else fall-back on the default allocator
- */
-class TargetAllocator : public SkBitmap::Allocator {
-public:
-    TargetAllocator(const SkImageInfo& info,
-                    void* target,
-                    size_t rowBytes)
-        : fInfo(info)
-        , fTarget(target)
-        , fRowBytes(rowBytes)
-    {}
-
-    bool isReady() { return (fTarget != nullptr); }
-
-    virtual bool allocPixelRef(SkBitmap* bm, SkColorTable* ct) {
-        if (nullptr == fTarget || !equal_modulo_alpha(fInfo, bm->info())) {
-            // Call default allocator.
-            return bm->tryAllocPixels(nullptr, ct);
-        }
-
-        // TODO(halcanary): verify that all callers of this function
-        // will respect new RowBytes.  Will be moot once rowbytes belongs
-        // to PixelRef.
-        bm->installPixels(fInfo, fTarget, fRowBytes, ct, nullptr, nullptr);
-
-        fTarget = nullptr;  // never alloc same pixels twice!
-        return true;
-    }
-
-private:
-    const SkImageInfo fInfo;
-    void* fTarget;  // Block of memory to be supplied as pixel memory
-                    // in allocPixelRef.  Must be large enough to hold
-                    // a bitmap described by fInfo and fRowBytes
-    const size_t fRowBytes;  // rowbytes for the destination bitmap
-
-    typedef SkBitmap::Allocator INHERITED;
-};
-
-// TODO(halcanary): Give this macro a better name and move it into SkTypes.h
-#ifdef SK_DEBUG
-    #define SkCheckResult(expr, value)  SkASSERT((value) == (expr))
-#else
-    #define SkCheckResult(expr, value)  (void)(expr)
-#endif
-
-#ifdef SK_DEBUG
-inline bool check_alpha(SkAlphaType reported, SkAlphaType actual) {
-    return ((reported == actual)
-            || ((reported == kPremul_SkAlphaType)
-                && (actual == kOpaque_SkAlphaType)));
-}
-#endif  // SK_DEBUG
-
-////////////////////////////////////////////////////////////////////////////////
-
-DecodingImageGenerator::DecodingImageGenerator(
-        SkData* data,
-        SkStreamRewindable* stream,
-        const SkImageInfo& info,
-        int sampleSize,
-        bool ditherImage)
-    : INHERITED(info)
-    , fData(data)
-    , fStream(stream)
-    , fInfo(info)
-    , fSampleSize(sampleSize)
-    , fDitherImage(ditherImage)
-{
-    SkASSERT(stream != nullptr);
-    SkSafeRef(fData);  // may be nullptr.
-}
-
-DecodingImageGenerator::~DecodingImageGenerator() {
-    SkSafeUnref(fData);
-}
-
-SkData* DecodingImageGenerator::onRefEncodedData(SK_REFENCODEDDATA_CTXPARAM) {
-    // This functionality is used in `gm --serialize`
-    // Does not encode options.
-    if (nullptr == fData) {
-        // TODO(halcanary): SkStreamRewindable needs a refData() function
-        // which returns a cheap copy of the underlying data.
-        if (!fStream->rewind()) {
-            return nullptr;
-        }
-        size_t length = fStream->getLength();
-        if (length) {
-            fData = SkData::NewFromStream(fStream, length);
-        }
-    }
-    return SkSafeRef(fData);
-}
-
-bool DecodingImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
-                                         SkPMColor ctableEntries[], int* ctableCount) {
-    if (fInfo != info) {
-        // The caller has specified a different info.  This is an
-        // error for this kind of SkImageGenerator.  Use the Options
-        // to change the settings.
-        return false;
-    }
-
-    SkAssertResult(fStream->rewind());
-    SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(fStream));
-    if (nullptr == decoder.get()) {
-        return false;
-    }
-    decoder->setDitherImage(fDitherImage);
-    decoder->setSampleSize(fSampleSize);
-    decoder->setRequireUnpremultipliedColors(info.alphaType() == kUnpremul_SkAlphaType);
-
-    SkBitmap bitmap;
-    TargetAllocator allocator(fInfo, pixels, rowBytes);
-    decoder->setAllocator(&allocator);
-    const SkImageDecoder::Result decodeResult = decoder->decode(fStream, &bitmap, info.colorType(),
-                                                                SkImageDecoder::kDecodePixels_Mode);
-    decoder->setAllocator(nullptr);
-    if (SkImageDecoder::kFailure == decodeResult) {
-        return false;
-    }
-    if (allocator.isReady()) {  // Did not use pixels!
-        SkBitmap bm;
-        SkASSERT(bitmap.canCopyTo(info.colorType()));
-        bool copySuccess = bitmap.copyTo(&bm, info.colorType(), &allocator);
-        if (!copySuccess || allocator.isReady()) {
-            SkDEBUGFAIL("bitmap.copyTo(requestedConfig) failed.");
-            // Earlier we checked canCopyto(); we expect consistency.
-            return false;
-        }
-        SkASSERT(check_alpha(info.alphaType(), bm.alphaType()));
-    } else {
-        SkASSERT(check_alpha(info.alphaType(), bitmap.alphaType()));
-    }
-
-    if (kIndex_8_SkColorType == info.colorType()) {
-        if (kIndex_8_SkColorType != bitmap.colorType()) {
-            // they asked for Index8, but we didn't receive that from decoder
-            return false;
-        }
-        SkColorTable* ctable = bitmap.getColorTable();
-        if (nullptr == ctable) {
-            return false;
-        }
-        const int count = ctable->count();
-        memcpy(ctableEntries, ctable->readColors(), count * sizeof(SkPMColor));
-        *ctableCount = count;
-    }
-    return true;
-}
-
-bool DecodingImageGenerator::onGetYUV8Planes(SkISize sizes[3], void* planes[3],
-                                             size_t rowBytes[3], SkYUVColorSpace* colorSpace) {
-    if (!fStream->rewind()) {
-        return false;
-    }
-
-    SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(fStream));
-    if (nullptr == decoder.get()) {
-        return false;
-    }
-
-    return decoder->decodeYUV8Planes(fStream, sizes, planes, rowBytes, colorSpace);
-}
-
-// A contructor-type function that returns nullptr on failure.  This
-// prevents the returned SkImageGenerator from ever being in a bad
-// state.  Called by both Create() functions
-SkImageGenerator* CreateDecodingImageGenerator(
-        SkData* data,
-        SkStreamRewindable* stream,
-        const SkDecodingImageGenerator::Options& opts) {
-    SkASSERT(stream);
-    SkAutoTDelete<SkStreamRewindable> autoStream(stream);  // always delete this
-    SkAssertResult(autoStream->rewind());
-    SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(autoStream));
-    if (nullptr == decoder.get()) {
-        return nullptr;
-    }
-    SkBitmap bitmap;
-    decoder->setSampleSize(opts.fSampleSize);
-    decoder->setRequireUnpremultipliedColors(opts.fRequireUnpremul);
-    if (!decoder->decode(stream, &bitmap, SkImageDecoder::kDecodeBounds_Mode)) {
-        return nullptr;
-    }
-    if (kUnknown_SkColorType == bitmap.colorType()) {
-        return nullptr;
-    }
-
-    SkImageInfo info = bitmap.info();
-
-    if (opts.fUseRequestedColorType && (opts.fRequestedColorType != info.colorType())) {
-        if (!bitmap.canCopyTo(opts.fRequestedColorType)) {
-            SkASSERT(bitmap.colorType() != opts.fRequestedColorType);
-            return nullptr;  // Can not translate to needed config.
-        }
-        info = info.makeColorType(opts.fRequestedColorType);
-    }
-
-    if (opts.fRequireUnpremul && info.alphaType() != kOpaque_SkAlphaType) {
-        info = info.makeAlphaType(kUnpremul_SkAlphaType);
-    }
-
-    SkAlphaType newAlphaType = info.alphaType();
-    if (!SkColorTypeValidateAlphaType(info.colorType(), info.alphaType(), &newAlphaType)) {
-        return nullptr;
-    }
-
-    return new DecodingImageGenerator(data, autoStream.detach(), info.makeAlphaType(newAlphaType),
-                                      opts.fSampleSize, opts.fDitherImage);
-}
-
-}  // namespace
-
-////////////////////////////////////////////////////////////////////////////////
-
-SkImageGenerator* SkDecodingImageGenerator::Create(
-        SkData* data,
-        const SkDecodingImageGenerator::Options& opts) {
-    SkASSERT(data != nullptr);
-    if (nullptr == data) {
-        return nullptr;
-    }
-    SkStreamRewindable* stream = new SkMemoryStream(data);
-    SkASSERT(stream != nullptr);
-    return CreateDecodingImageGenerator(data, stream, opts);
-}
-
-SkImageGenerator* SkDecodingImageGenerator::Create(
-        SkStreamRewindable* stream,
-        const SkDecodingImageGenerator::Options& opts) {
-    SkASSERT(stream != nullptr);
-    if (stream == nullptr) {
-        return nullptr;
-    }
-    return CreateDecodingImageGenerator(nullptr, stream, opts);
-}
diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp
deleted file mode 100644
index 560fda5374..0000000000
--- a/tests/ImageDecodingTest.cpp
+++ /dev/null
@@ -1,732 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "Resources.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkColorPriv.h"
-#include "SkData.h"
-#include "SkDecodingImageGenerator.h"
-#include "SkDiscardableMemoryPool.h"
-#include "SkForceLinking.h"
-#include "SkGradientShader.h"
-#include "SkImageDecoder.h"
-#include "SkImageEncoder.h"
-#include "SkImageGeneratorPriv.h"
-#include "SkImagePriv.h"
-#include "SkOSFile.h"
-#include "SkPoint.h"
-#include "SkShader.h"
-#include "SkStream.h"
-#include "SkString.h"
-#include "Test.h"
-
-__SK_FORCE_IMAGE_DECODER_LINKING;
-
-/**
- *  Interprets c as an unpremultiplied color, and returns the
- *  premultiplied equivalent.
- */
-static SkPMColor premultiply_unpmcolor(SkPMColor c) {
-    U8CPU a = SkGetPackedA32(c);
-    U8CPU r = SkGetPackedR32(c);
-    U8CPU g = SkGetPackedG32(c);
-    U8CPU b = SkGetPackedB32(c);
-    return SkPreMultiplyARGB(a, r, g, b);
-}
-
-/**
- *  Return true if this stream format should be skipped, due
- *  to do being an opaque format or not a valid format.
- */
-static bool skip_image_format(SkImageDecoder::Format format) {
-    switch (format) {
-        case SkImageDecoder::kPNG_Format:
-        case SkImageDecoder::kWEBP_Format:
-            return false;
-        // Skip unknown since it will not be decoded anyway.
-        case SkImageDecoder::kUnknown_Format:
-        // Technically ICO and BMP supports alpha channels, but our image
-        // decoders do not, so skip them as well.
-        case SkImageDecoder::kICO_Format:
-        case SkImageDecoder::kBMP_Format:
-        // KTX and ASTC are texture formats so it's not particularly clear how to 
-        // decode the alpha from them.
-        case SkImageDecoder::kKTX_Format:
-        case SkImageDecoder::kASTC_Format:
-        // The rest of these are opaque.
-        case SkImageDecoder::kPKM_Format:
-        case SkImageDecoder::kWBMP_Format:
-        case SkImageDecoder::kGIF_Format:
-        case SkImageDecoder::kJPEG_Format:
-            return true;
-    }
-    SkASSERT(false);
-    return true;
-}
-
-/**
- *  Test decoding an image in premultiplied mode and unpremultiplied mode and compare
- *  them.
- */
-static void compare_unpremul(skiatest::Reporter* reporter, const SkString& filename) {
-    // Decode a resource:
-    SkBitmap bm8888;
-    SkBitmap bm8888Unpremul;
-
-    SkFILEStream stream(filename.c_str());
-
-    SkImageDecoder::Format format = SkImageDecoder::GetStreamFormat(&stream);
-    if (skip_image_format(format)) {
-        return;
-    }
-
-    SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(&stream));
-    if (nullptr == decoder.get()) {
-        SkDebugf("couldn't decode %s\n", filename.c_str());
-        return;
-    }
-
-    bool success = decoder->decode(&stream, &bm8888, kN32_SkColorType,
-                                   SkImageDecoder::kDecodePixels_Mode) != SkImageDecoder::kFailure;
-    if (!success) {
-        return;
-    }
-
-    success = stream.rewind();
-    REPORTER_ASSERT(reporter, success);
-    if (!success) {
-        return;
-    }
-
-    decoder->setRequireUnpremultipliedColors(true);
-    success = decoder->decode(&stream, &bm8888Unpremul, kN32_SkColorType,
-                              SkImageDecoder::kDecodePixels_Mode) != SkImageDecoder::kFailure;
-    if (!success) {
-        return;
-    }
-
-    bool dimensionsMatch = bm8888.width() == bm8888Unpremul.width()
-                           && bm8888.height() == bm8888Unpremul.height();
-    REPORTER_ASSERT(reporter, dimensionsMatch);
-    if (!dimensionsMatch) {
-        return;
-    }
-
-    // Only do the comparison if the two bitmaps are both 8888.
-    if (bm8888.colorType() != kN32_SkColorType || bm8888Unpremul.colorType() != kN32_SkColorType) {
-        return;
-    }
-
-    // Now compare the two bitmaps.
-    for (int i = 0; i < bm8888.width(); ++i) {
-        for (int j = 0; j < bm8888.height(); ++j) {
-            // "c0" is the color of the premultiplied bitmap at (i, j).
-            const SkPMColor c0 = *bm8888.getAddr32(i, j);
-            // "c1" is the result of premultiplying the color of the unpremultiplied
-            // bitmap at (i, j).
-            const SkPMColor c1 = premultiply_unpmcolor(*bm8888Unpremul.getAddr32(i, j));
-            // Compute the difference for each component.
-            int da = SkAbs32(SkGetPackedA32(c0) - SkGetPackedA32(c1));
-            int dr = SkAbs32(SkGetPackedR32(c0) - SkGetPackedR32(c1));
-            int dg = SkAbs32(SkGetPackedG32(c0) - SkGetPackedG32(c1));
-            int db = SkAbs32(SkGetPackedB32(c0) - SkGetPackedB32(c1));
-
-            // Alpha component must be exactly the same.
-            REPORTER_ASSERT(reporter, 0 == da);
-
-            // Color components may not match exactly due to rounding error.
-            REPORTER_ASSERT(reporter, dr <= 1);
-            REPORTER_ASSERT(reporter, dg <= 1);
-            REPORTER_ASSERT(reporter, db <= 1);
-        }
-    }
-}
-
-static void test_unpremul(skiatest::Reporter* reporter) {
-    // This test cannot run if there is no resource path.
-    SkString resourcePath = GetResourcePath();
-    if (resourcePath.isEmpty()) {
-        SkDebugf("Could not run unpremul test because resourcePath not specified.");
-        return;
-    }
-    SkOSFile::Iter iter(resourcePath.c_str());
-    SkString basename;
-    if (iter.next(&basename)) {
-        do {
-            SkString filename = SkOSPath::Join(resourcePath.c_str(), basename.c_str());
-            // SkDebugf("about to decode \"%s\"\n", filename.c_str());
-            compare_unpremul(reporter, filename);
-        } while (iter.next(&basename));
-    } else {
-        SkDebugf("Failed to find any files :(\n");
-    }
-}
-
-#if defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX)
-// Test that the alpha type is what we expect.
-static void test_alphaType(skiatest::Reporter* reporter, const SkString& filename,
-                           bool requireUnpremul) {
-    SkBitmap bm;
-    SkFILEStream stream(filename.c_str());
-
-    SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(&stream));
-    if (nullptr == decoder.get()) {
-        return;
-    }
-
-    decoder->setRequireUnpremultipliedColors(requireUnpremul);
-
-    // Decode just the bounds. This should always succeed.
-    bool success = decoder->decode(&stream, &bm, kN32_SkColorType,
-                                   SkImageDecoder::kDecodeBounds_Mode);
-    REPORTER_ASSERT(reporter, success);
-    if (!success) {
-        return;
-    }
-
-    // Keep track of the alpha type for testing later. If the full decode
-    // succeeds, the alpha type should be the same, unless the full decode
-    // determined that the alpha type should actually be opaque, which may
-    // not be known when only decoding the bounds.
-    const SkAlphaType boundsAlphaType = bm.alphaType();
-
-    // rewind should always succeed on SkFILEStream.
-    success = stream.rewind();
-    REPORTER_ASSERT(reporter, success);
-    if (!success) {
-        return;
-    }
-
-    success = decoder->decode(&stream, &bm, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode);
-
-    if (!success) {
-        // When the decoder is set to require unpremul, if it does not support
-        // unpremul it will fail. This is the only reason the decode should
-        // fail (since we know the files we are using to test can be decoded).
-        REPORTER_ASSERT(reporter, requireUnpremul);
-        return;
-    }
-
-    // The bounds decode should return with either the requested
-    // premul/unpremul or opaque, if that value could be determined when only
-    // decoding the bounds.
-    if (requireUnpremul) {
-        REPORTER_ASSERT(reporter, kUnpremul_SkAlphaType == boundsAlphaType
-                                  || kOpaque_SkAlphaType == boundsAlphaType
-                                  || filename.endsWith(".ico"));
-        // TODO(halcanary): Find out why color_wheel.ico fails this test.
-    } else {
-        REPORTER_ASSERT(reporter, kPremul_SkAlphaType == boundsAlphaType
-                                  || kOpaque_SkAlphaType == boundsAlphaType);
-    }
-
-    // When decoding the full image, the alpha type should match the one
-    // returned by the bounds decode, unless the full decode determined that
-    // the alpha type is actually opaque.
-    REPORTER_ASSERT(reporter, bm.alphaType() == boundsAlphaType
-                              || bm.alphaType() == kOpaque_SkAlphaType);
-}
-
-DEF_TEST(ImageDecoding_alphaType, reporter) {
-    SkString resourcePath = GetResourcePath();
-    if (resourcePath.isEmpty()) {
-        SkDebugf("Could not run alphaType test because resourcePath not specified.");
-        return;
-    }
-
-    SkOSFile::Iter iter(resourcePath.c_str());
-    SkString basename;
-    if (iter.next(&basename)) {
-        do {
-            SkString filename = SkOSPath::Join(resourcePath.c_str(), basename.c_str());
-            for (int truth = 0; truth <= 1; ++truth) {
-                test_alphaType(reporter, filename, SkToBool(truth));
-            }
-        } while (iter.next(&basename));
-    } else {
-        SkDebugf("Failed to find any files :(\n");
-    }
-
-}
-
-// Using known images, test that decoding into unpremul and premul behave as expected.
-DEF_TEST(ImageDecoding_unpremul, reporter) {
-    SkString resourcePath = GetResourcePath();
-    if (resourcePath.isEmpty()) {
-        SkDebugf("Could not run unpremul test because resourcePath not specified.");
-        return;
-    }
-    const char* root = "half-transparent-white-pixel";
-    const char* suffixes[] = { ".png", ".webp" };
-
-    for (size_t i = 0; i < SK_ARRAY_COUNT(suffixes); ++i) {
-        SkString basename = SkStringPrintf("%s%s", root, suffixes[i]);
-        SkString fullName = SkOSPath::Join(resourcePath.c_str(), basename.c_str());
-
-        SkBitmap bm;
-        SkFILEStream stream(fullName.c_str());
-
-        if (!stream.isValid()) {
-            SkDebugf("file %s missing from resource directoy %s\n",
-                     basename.c_str(), resourcePath.c_str());
-            continue;
-        }
-
-        // This should never fail since we know the images we're decoding.
-        SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(&stream));
-        REPORTER_ASSERT(reporter, decoder.get());
-        if (nullptr == decoder.get()) {
-            continue;
-        }
-
-        // Test unpremultiplied. We know what color this should result in.
-        decoder->setRequireUnpremultipliedColors(true);
-        bool success = decoder->decode(&stream, &bm, kN32_SkColorType,
-                                       SkImageDecoder::kDecodePixels_Mode);
-        REPORTER_ASSERT(reporter, success);
-        if (!success) {
-            continue;
-        }
-
-        REPORTER_ASSERT(reporter, bm.width() == 1 && bm.height() == 1);
-        {
-            SkAutoLockPixels alp(bm);
-            REPORTER_ASSERT(reporter, bm.getAddr32(0, 0)[0] == 0x7fffffff);
-        }
-
-        success = stream.rewind();
-        REPORTER_ASSERT(reporter, success);
-        if (!success) {
-            continue;
-        }
-
-        // Test premultiplied. Once again, we know which color this should
-        // result in.
-        decoder->setRequireUnpremultipliedColors(false);
-        success = decoder->decode(&stream, &bm, kN32_SkColorType,
-                                  SkImageDecoder::kDecodePixels_Mode);
-        REPORTER_ASSERT(reporter, success);
-        if (!success) {
-            continue;
-        }
-
-        REPORTER_ASSERT(reporter, bm.width() == 1 && bm.height() == 1);
-        {
-            SkAutoLockPixels alp(bm);
-            REPORTER_ASSERT(reporter, bm.getAddr32(0, 0)[0] == 0x7f7f7f7f);
-        }
-    }
-}
-#endif // SK_BUILD_FOR_UNIX/ANDROID https://bug.skia.org/2388
-
-#ifdef SK_DEBUG
-// Test inside SkScaledBitmapSampler.cpp
-extern void test_row_proc_choice();
-#endif  // SK_DEBUG
-
-DEF_TEST(ImageDecoding, reporter) {
-    test_unpremul(reporter);
-#ifdef SK_DEBUG
-    test_row_proc_choice();
-#endif
-}
-
-// expected output for 8x8 bitmap
-static const int kExpectedWidth = 8;
-static const int kExpectedHeight = 8;
-static const SkColor kExpectedPixels[] = {
-    0xffbba570, 0xff395f5d, 0xffe25c39, 0xff197666,
-    0xff3cba27, 0xffdefcb0, 0xffc13874, 0xfffa0093,
-    0xffbda60e, 0xffc01db6, 0xff2bd688, 0xff9362d4,
-    0xffc641b2, 0xffa5cede, 0xff606eba, 0xff8f4bf3,
-    0xff3bf742, 0xff8f02a8, 0xff5509df, 0xffc7027e,
-    0xff24aa8a, 0xff886c96, 0xff625481, 0xff403689,
-    0xffc52152, 0xff78ccd6, 0xffdcb4ab, 0xff09d27d,
-    0xffca00f3, 0xff605d47, 0xff446fb2, 0xff576e46,
-    0xff273df9, 0xffb41a83, 0xfff812c3, 0xffccab67,
-    0xff034218, 0xff7db9a7, 0xff821048, 0xfffe4ab4,
-    0xff6fac98, 0xff941d27, 0xff5fe411, 0xfffbb283,
-    0xffd86e99, 0xff169162, 0xff71128c, 0xff39cab4,
-    0xffa7fe63, 0xff4c956b, 0xffbc22e0, 0xffb272e4,
-    0xff129f4a, 0xffe34513, 0xff3d3742, 0xffbd190a,
-    0xffb07222, 0xff2e23f8, 0xfff089d9, 0xffb35738,
-    0xffa86022, 0xff3340fe, 0xff95fe71, 0xff6a71df
-};
-static_assert((kExpectedWidth * kExpectedHeight) == SK_ARRAY_COUNT(kExpectedPixels),
-              "array_size_mismatch");
-
-static bool decode_into_bitmap(skiatest::Reporter* r, SkBitmap* bm, SkData* encoded) {
-    SkAutoTDelete<SkImageGenerator> gen(SkImageGenerator::NewFromEncoded(encoded));
-    if (!gen) {
-        REPORTER_ASSERT(r, false);
-        return false;
-    }
-    if (!gen->tryGenerateBitmap(bm)) {
-        REPORTER_ASSERT(r, false);
-        return false;
-    }
-    return true;
-}
-
-DEF_TEST(WebP, reporter) {
-    const unsigned char encodedWebP[] = {
-        0x52, 0x49, 0x46, 0x46, 0x2c, 0x01, 0x00, 0x00, 0x57, 0x45, 0x42, 0x50,
-        0x56, 0x50, 0x38, 0x4c, 0x20, 0x01, 0x00, 0x00, 0x2f, 0x07, 0xc0, 0x01,
-        0x00, 0xff, 0x01, 0x45, 0x03, 0x00, 0xe2, 0xd5, 0xae, 0x60, 0x2b, 0xad,
-        0xd9, 0x68, 0x76, 0xb6, 0x8d, 0x6a, 0x1d, 0xc0, 0xe6, 0x19, 0xd6, 0x16,
-        0xb7, 0xb4, 0xef, 0xcf, 0xc3, 0x15, 0x6c, 0xb3, 0xbd, 0x77, 0x0d, 0x85,
-        0x6d, 0x1b, 0xa9, 0xb1, 0x2b, 0xdc, 0x3d, 0x83, 0xdb, 0x00, 0x00, 0xc8,
-        0x26, 0xe5, 0x01, 0x99, 0x8a, 0xd5, 0xdd, 0xfc, 0x82, 0xcd, 0xcd, 0x9a,
-        0x8c, 0x13, 0xcc, 0x1b, 0xba, 0xf5, 0x05, 0xdb, 0xee, 0x6a, 0xdb, 0x38,
-        0x60, 0xfe, 0x43, 0x2c, 0xd4, 0x6a, 0x99, 0x4d, 0xc6, 0xc0, 0xd3, 0x28,
-        0x1b, 0xc1, 0xb1, 0x17, 0x4e, 0x43, 0x0e, 0x3d, 0x27, 0xe9, 0xe4, 0x84,
-        0x4f, 0x24, 0x62, 0x69, 0x85, 0x43, 0x8d, 0xc2, 0x04, 0x00, 0x07, 0x59,
-        0x60, 0xfd, 0x8b, 0x4d, 0x60, 0x32, 0x72, 0xcf, 0x88, 0x0c, 0x2f, 0x2f,
-        0xad, 0x62, 0xbd, 0x27, 0x09, 0x16, 0x70, 0x78, 0x6c, 0xd9, 0x82, 0xef,
-        0x1a, 0xa2, 0xcc, 0xf0, 0xf1, 0x6f, 0xd8, 0x78, 0x2e, 0x39, 0xa1, 0xcf,
-        0x14, 0x4b, 0x89, 0xb4, 0x1b, 0x48, 0x15, 0x7c, 0x48, 0x6f, 0x8c, 0x20,
-        0xb7, 0x00, 0xcf, 0xfc, 0xdb, 0xd0, 0xe9, 0xe7, 0x42, 0x09, 0xa4, 0x03,
-        0x40, 0xac, 0xda, 0x40, 0x01, 0x00, 0x5f, 0xa1, 0x3d, 0x64, 0xe1, 0xf4,
-        0x03, 0x45, 0x29, 0xe0, 0xe2, 0x4a, 0xc3, 0xa2, 0xe8, 0xe0, 0x25, 0x12,
-        0x74, 0xc6, 0xe8, 0xfb, 0x93, 0x4f, 0x9f, 0x5e, 0xc0, 0xa6, 0x91, 0x1b,
-        0xa4, 0x24, 0x82, 0xc3, 0x61, 0x07, 0x4c, 0x49, 0x4f, 0x53, 0xae, 0x5f,
-        0x5d, 0x39, 0x36, 0xc0, 0x5b, 0x57, 0x54, 0x60, 0x10, 0x00, 0x00, 0xd1,
-        0x68, 0xb6, 0x6d, 0xdb, 0x36, 0x22, 0xfa, 0x1f, 0x35, 0x75, 0x22, 0xec,
-        0x31, 0xbc, 0x5d, 0x8f, 0x87, 0x53, 0xa2, 0x05, 0x8c, 0x2f, 0xcd, 0xa8,
-        0xa7, 0xf3, 0xa3, 0xbd, 0x83, 0x8b, 0x2a, 0xc8, 0x58, 0xf5, 0xac, 0x80,
-        0xe3, 0xfe, 0x66, 0xa4, 0x7c, 0x1b, 0x6c, 0xd1, 0xa9, 0xd8, 0x14, 0xd0,
-        0xc5, 0xb5, 0x39, 0x71, 0x97, 0x19, 0x19, 0x1b
-    };
-
-    SkBitmap bm;
-    SkAutoDataUnref encoded(SkData::NewWithoutCopy(encodedWebP, sizeof(encodedWebP)));
-    if (!decode_into_bitmap(reporter, &bm, encoded)) {
-        return;
-    }
-    if (kExpectedWidth != bm.width() || kExpectedHeight != bm.height()) {
-        REPORTER_ASSERT(reporter, false);
-        return;
-    }
-
-    bool error = false;
-    const SkColor* correctPixel = kExpectedPixels;
-    for (int y = 0; y < bm.height(); ++y) {
-        for (int x = 0; x < bm.width(); ++x) {
-            error |= (*correctPixel != bm.getColor(x, y));
-            ++correctPixel;
-        }
-    }
-    REPORTER_ASSERT(reporter, !error);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- *  A test for the SkDecodingImageGenerator::Create
- */
-DEF_TEST(ImprovedBitmapFactory, reporter) {
-    SkString pngFilename = GetResourcePath("randPixels.png");
-    SkAutoTDelete<SkStreamRewindable> stream(SkStream::NewFromFile(pngFilename.c_str()));
-    if (sk_exists(pngFilename.c_str())) {
-        // example of how Android will do this inside their BitmapFactory
-        SkDecodingImageGenerator::Options opts(1, true, kN32_SkColorType);
-        SkBitmap bm;
-        SkAutoTDelete<SkImageGenerator> gen(SkDecodingImageGenerator::Create(stream.detach(),
-                                                                             opts));
-        REPORTER_ASSERT(reporter, gen->tryGenerateBitmap(&bm));
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-#if defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX)
-static inline bool check_rounding(int value, int dividend, int divisor) {
-    // returns true if the value is greater than floor(dividend/divisor)
-    // and less than SkNextPow2(ceil(dividend - divisor))
-    return (((divisor * value) > (dividend - divisor))
-            && value <= SkNextPow2(((dividend - 1) / divisor) + 1));
-}
-#endif  // SK_BUILD_FOR_ANDROID || SK_BUILD_FOR_UNIX
-
-
-#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
-    #define kBackwards_SkColorType kRGBA_8888_SkColorType
-#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
-    #define kBackwards_SkColorType kBGRA_8888_SkColorType
-#else
-    #error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order"
-#endif
-
-static inline const char* SkColorType_to_string(SkColorType colorType) {
-    switch(colorType) {
-        case kAlpha_8_SkColorType:   return "Alpha_8";
-        case kRGB_565_SkColorType:   return "RGB_565";
-        case kARGB_4444_SkColorType: return "ARGB_4444";
-        case kN32_SkColorType:       return "N32";
-        case kBackwards_SkColorType: return "Backwards";
-        case kIndex_8_SkColorType:   return "Index_8";
-        default:                     return "ERROR";
-    }
-}
-
-static inline const char* options_colorType(
-        const SkDecodingImageGenerator::Options& opts) {
-    if (opts.fUseRequestedColorType) {
-        return SkColorType_to_string(opts.fRequestedColorType);
-    } else {
-        return "(none)";
-    }
-}
-
-static inline const char* yn(bool value) {
-    if (value) {
-        return "yes";
-    } else {
-        return "no";
-    }
-}
-
-/**
- * Given either a SkStream or a SkData, try to decode the encoded
- * image using the specified options and report errors.
- */
-static void test_options(skiatest::Reporter* reporter,
-                         const SkDecodingImageGenerator::Options& opts,
-                         SkStreamRewindable* encodedStream,
-                         SkData* encodedData,
-                         bool useData,
-                         const SkString& path) {
-    SkBitmap bm;
-    SkAutoTDelete<SkImageGenerator> gen;
-
-    if (useData) {
-        if (nullptr == encodedData) {
-            return;
-        }
-        gen.reset(SkDecodingImageGenerator::Create(encodedData, opts));
-    } else {
-        if (nullptr == encodedStream) {
-            return;
-        }
-        gen.reset(SkDecodingImageGenerator::Create(encodedStream->duplicate(), opts));
-    }
-    if (!gen) {
-        if (opts.fUseRequestedColorType && (kARGB_4444_SkColorType == opts.fRequestedColorType)) {
-            return;  // Ignore known conversion inabilities.
-        }
-        // If we get here, it's a failure and we will need more
-        // information about why it failed.
-        ERRORF(reporter, "Bounds decode failed [sampleSize=%d dither=%s "
-               "colorType=%s %s]", opts.fSampleSize, yn(opts.fDitherImage),
-               options_colorType(opts), path.c_str());
-        return;
-    }
-    if (!gen->tryGenerateBitmap(&bm)) {
-        return;
-    }
-
-    #if defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX)
-    // Android is the only system that use Skia's image decoders in
-    // production.  For now, we'll only verify that samplesize works
-    // on systems where it already is known to work.
-    REPORTER_ASSERT(reporter, check_rounding(bm.height(), kExpectedHeight, opts.fSampleSize));
-    REPORTER_ASSERT(reporter, check_rounding(bm.width(), kExpectedWidth, opts.fSampleSize));
-    // The ImageDecoder API doesn't guarantee that SampleSize does
-    // anything at all, but the decoders that this test excercises all
-    // produce an output size in the following range:
-    //    (((sample_size * out_size) > (in_size - sample_size))
-    //     && out_size <= SkNextPow2(((in_size - 1) / sample_size) + 1));
-    #endif  // SK_BUILD_FOR_ANDROID || SK_BUILD_FOR_UNIX
-
-    SkColorType requestedColorType = opts.fRequestedColorType;
-    REPORTER_ASSERT(reporter,
-                    (!opts.fUseRequestedColorType)
-                    || (bm.colorType() == requestedColorType));
-
-    // Condition under which we should check the decoding results:
-    if ((kN32_SkColorType == bm.colorType())
-        && (!path.endsWith(".jpg"))  // lossy
-        && (opts.fSampleSize == 1)) {  // scaled
-        const SkColor* correctPixels = kExpectedPixels;
-        SkASSERT(bm.height() == kExpectedHeight);
-        SkASSERT(bm.width() == kExpectedWidth);
-        int pixelErrors = 0;
-        for (int y = 0; y < bm.height(); ++y) {
-            for (int x = 0; x < bm.width(); ++x) {
-                if (*correctPixels != bm.getColor(x, y)) {
-                    ++pixelErrors;
-                }
-                ++correctPixels;
-            }
-        }
-        if (pixelErrors != 0) {
-            ERRORF(reporter, "Pixel-level mismatch (%d of %d) "
-                   "[sampleSize=%d dither=%s colorType=%s %s]",
-                   pixelErrors, kExpectedHeight * kExpectedWidth,
-                   opts.fSampleSize, yn(opts.fDitherImage),
-                   options_colorType(opts), path.c_str());
-        }
-    }
-}
-
-/**
- *  SkDecodingImageGenerator has an Options struct which lets the
- *  client of the generator set sample size, dithering, and bitmap
- *  config.  This test loops through many possible options and tries
- *  them on a set of 5 small encoded images (each in a different
- *  format).  We test both SkData and SkStreamRewindable decoding.
- */
-DEF_TEST(ImageDecoderOptions, reporter) {
-    const char* files[]  = {
-        "randPixels.bmp",
-        "randPixels.jpg",
-        "randPixels.png",
-        "randPixels.webp",
-        #if !defined(SK_BUILD_FOR_WIN)
-        // TODO(halcanary): Find out why this fails sometimes.
-        "randPixels.gif",
-        #endif
-    };
-
-    SkString resourceDir = GetResourcePath();
-    if (!sk_exists(resourceDir.c_str())) {
-        return;
-    }
-
-    int scaleList[] = {1, 2, 3, 4};
-    bool ditherList[] = {true, false};
-    SkColorType colorList[] = {
-        kAlpha_8_SkColorType,
-        kRGB_565_SkColorType,
-        kARGB_4444_SkColorType,  // Most decoders will fail on 4444.
-        kN32_SkColorType
-        // Note that indexed color is left out of the list.  Lazy
-        // decoding doesn't do indexed color.
-    };
-    const bool useDataList[] = {true, false};
-
-    for (size_t fidx = 0; fidx < SK_ARRAY_COUNT(files); ++fidx) {
-        SkString path = SkOSPath::Join(resourceDir.c_str(), files[fidx]);
-        if (!sk_exists(path.c_str())) {
-            continue;
-        }
-
-        SkAutoDataUnref encodedData(SkData::NewFromFileName(path.c_str()));
-        REPORTER_ASSERT(reporter, encodedData.get() != nullptr);
-        SkAutoTDelete<SkStreamRewindable> encodedStream(
-            SkStream::NewFromFile(path.c_str()));
-        REPORTER_ASSERT(reporter, encodedStream.get() != nullptr);
-
-        for (size_t i = 0; i < SK_ARRAY_COUNT(scaleList); ++i) {
-            for (size_t j = 0; j < SK_ARRAY_COUNT(ditherList); ++j) {
-                for (size_t m = 0; m < SK_ARRAY_COUNT(useDataList); ++m) {
-                    for (size_t k = 0; k < SK_ARRAY_COUNT(colorList); ++k) {
-                        SkDecodingImageGenerator::Options opts(scaleList[i],
-                                                               ditherList[j],
-                                                               colorList[k]);
-                        test_options(reporter, opts, encodedStream, encodedData,
-                                     useDataList[m], path);
-
-                    }
-                    SkDecodingImageGenerator::Options options(scaleList[i],
-                                                              ditherList[j]);
-                    test_options(reporter, options, encodedStream, encodedData,
-                                 useDataList[m], path);
-                }
-            }
-        }
-    }
-}
-
-DEF_TEST(DecodingImageGenerator_ColorTableCheck, r) {
-    SkString resourceDir = GetResourcePath();
-    SkString path = SkOSPath::Join(resourceDir.c_str(), "randPixels.gif");
-    if (!sk_exists(path.c_str())) {
-        return;
-    }
-    SkAutoDataUnref encoded(SkData::NewFromFileName(path.c_str()));
-    SkBitmap bitmap;
-    SkAutoTDelete<SkImageGenerator> gen(SkDecodingImageGenerator::Create(encoded,
-                                                             SkDecodingImageGenerator::Options()));
-    if (!gen) {
-        REPORTER_ASSERT(r, false);
-        return;
-    }
-    if (!gen->tryGenerateBitmap(&bitmap)) {
-        REPORTER_ASSERT(r, false);
-        return;
-    }
-    if (kIndex_8_SkColorType != bitmap.colorType()) {
-        return;
-    }
-    REPORTER_ASSERT(r, bitmap.getColorTable());
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-namespace {
-class SingleAllocator : public SkBitmap::Allocator {
-public:
-    SingleAllocator(void* p, size_t s) : fPixels(p), fSize(s) { }
-    ~SingleAllocator() {}
-    // If the pixels in fPixels are big enough, use them.
-    bool allocPixelRef(SkBitmap* bm, SkColorTable* ct) override {
-        SkASSERT(bm);
-        if (bm->info().getSafeSize(bm->rowBytes()) <= fSize) {
-            bm->setPixels(fPixels, ct);
-            fPixels = nullptr;
-            fSize = 0;
-            return true;
-        }
-        return bm->tryAllocPixels(nullptr, ct);
-    }
-    bool ready() { return fPixels != nullptr; }
-private:
-    void* fPixels;
-    size_t fSize;
-};
-}  // namespace
-
-/*  This tests for a bug in libjpeg where INT32 is typedefed to long
-    and memory can be written to outside of the array. */
-DEF_TEST(ImageDecoding_JpegOverwrite, r) {
-    SkString resourceDir = GetResourcePath();
-    SkString path = SkOSPath::Join(resourceDir.c_str(), "randPixels.jpg");
-    SkAutoTDelete<SkStreamAsset> stream(
-            SkStream::NewFromFile(path.c_str()));
-    if (!stream.get()) {
-        SkDebugf("\nPath '%s' missing.\n", path.c_str());
-        return;
-    }
-    SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(stream));
-    if (nullptr == decoder.get()) {
-        ERRORF(r, "\nSkImageDecoder::Factory failed.\n");
-        return;
-    }
-    SkAssertResult(stream->rewind());
-
-    static const uint16_t sentinal = 0xBEEF;
-    static const int pixelCount = 16;
-    SkAutoTMalloc<uint16_t> pixels(pixelCount + 1);
-    // pixels.get() should be 4-byte aligned.
-    // This is necessary to reproduce the bug.
-
-    pixels[pixelCount] = sentinal;  // This value should not be changed.
-
-    SkAutoTUnref<SingleAllocator> allocator(
-            new SingleAllocator((void*)pixels.get(), sizeof(uint16_t) * pixelCount));
-    decoder->setAllocator(allocator);
-    decoder->setSampleSize(2);
-    SkBitmap bitmap;
-    bool success = decoder->decode(stream, &bitmap, kRGB_565_SkColorType,
-                                   SkImageDecoder::kDecodePixels_Mode) != SkImageDecoder::kFailure;
-    REPORTER_ASSERT(r, success);
-    REPORTER_ASSERT(r, !allocator->ready());  // Decoder used correct memory
-    REPORTER_ASSERT(r, sentinal == pixels[pixelCount]);
-}
diff --git a/tests/JpegTest.cpp b/tests/JpegTest.cpp
deleted file mode 100644
index 1e7499a513..0000000000
--- a/tests/JpegTest.cpp
+++ /dev/null
@@ -1,604 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkBitmap.h"
-#include "SkCodec.h"
-#include "SkDecodingImageGenerator.h"
-#include "SkForceLinking.h"
-#include "SkImageDecoder.h"
-#include "SkPixelRef.h"
-#include "Resources.h"
-#include "SkStream.h"
-#include "SkTemplates.h"
-#include "Test.h"
-
-__SK_FORCE_IMAGE_DECODER_LINKING;
-
-#define JPEG_TEST_WRITE_TO_FILE_FOR_DEBUGGING 0  // do not do this for
-                                                 // normal unit testing.
-static unsigned char goodJpegImage[] = {
-0xFF, 0xD8, 0xFF, 0xE0, 0x00, 0x10, 0x4A, 0x46,
-0x49, 0x46, 0x00, 0x01, 0x01, 0x01, 0x00, 0x8F,
-0x00, 0x8F, 0x00, 0x00, 0xFF, 0xDB, 0x00, 0x43,
-0x00, 0x05, 0x03, 0x04, 0x04, 0x04, 0x03, 0x05,
-0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x06, 0x07,
-0x0C, 0x08, 0x07, 0x07, 0x07, 0x07, 0x0F, 0x0B,
-0x0B, 0x09, 0x0C, 0x11, 0x0F, 0x12, 0x12, 0x11,
-0x0F, 0x11, 0x11, 0x13, 0x16, 0x1C, 0x17, 0x13,
-0x14, 0x1A, 0x15, 0x11, 0x11, 0x18, 0x21, 0x18,
-0x1A, 0x1D, 0x1D, 0x1F, 0x1F, 0x1F, 0x13, 0x17,
-0x22, 0x24, 0x22, 0x1E, 0x24, 0x1C, 0x1E, 0x1F,
-0x1E, 0xFF, 0xDB, 0x00, 0x43, 0x01, 0x05, 0x05,
-0x05, 0x07, 0x06, 0x07, 0x0E, 0x08, 0x08, 0x0E,
-0x1E, 0x14, 0x11, 0x14, 0x1E, 0x1E, 0x1E, 0x1E,
-0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E,
-0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E,
-0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E,
-0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E,
-0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E,
-0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0xFF, 0xC0,
-0x00, 0x11, 0x08, 0x00, 0x80, 0x00, 0x80, 0x03,
-0x01, 0x22, 0x00, 0x02, 0x11, 0x01, 0x03, 0x11,
-0x01, 0xFF, 0xC4, 0x00, 0x18, 0x00, 0x01, 0x01,
-0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00,
-0x08, 0x06, 0x05, 0xFF, 0xC4, 0x00, 0x4C, 0x10,
-0x00, 0x00, 0x01, 0x07, 0x08, 0x05, 0x08, 0x05,
-0x0A, 0x03, 0x09, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x02, 0x03, 0x04, 0x06, 0x07, 0x11,
-0x05, 0x08, 0x12, 0x13, 0x14, 0x15, 0x38, 0xB4,
-0x16, 0x17, 0x21, 0x31, 0x84, 0x18, 0x22, 0x23,
-0x24, 0x58, 0xA5, 0xA6, 0xD2, 0x32, 0x51, 0x56,
-0x61, 0xD3, 0x28, 0x33, 0x41, 0x48, 0x67, 0x85,
-0x86, 0xC3, 0xE4, 0xF0, 0x25, 0x49, 0x55, 0x09,
-0x34, 0x35, 0x36, 0x53, 0x68, 0x72, 0x81, 0xA7,
-0xE2, 0xFF, 0xC4, 0x00, 0x14, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-0xC4, 0x00, 0x14, 0x11, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xDA, 0x00,
-0x0C, 0x03, 0x01, 0x00, 0x02, 0x11, 0x03, 0x11,
-0x00, 0x3F, 0x00, 0xD9, 0x62, 0x10, 0x80, 0x40,
-0x65, 0xED, 0x62, 0x75, 0xC8, 0x7D, 0xFF, 0x00,
-0x92, 0x30, 0x33, 0x01, 0x97, 0xB5, 0x89, 0xD7,
-0x21, 0xF7, 0xFE, 0x48, 0xC0, 0x0C, 0xC2, 0x10,
-0x80, 0x40, 0x66, 0x64, 0xB8, 0x62, 0x64, 0x78,
-0xDC, 0xEA, 0x70, 0xCC, 0x06, 0x66, 0x4B, 0x86,
-0x26, 0x47, 0x8D, 0xCE, 0xA7, 0x00, 0xCC, 0x21,
-0x08, 0x04, 0x31, 0x9F, 0xF2, 0xC5, 0xFD, 0xFF,
-0x00, 0x5A, 0x1B, 0x30, 0x63, 0x3F, 0xE5, 0x8B,
-0xFB, 0xFE, 0xB4, 0x03, 0x66, 0x01, 0x99, 0x92,
-0xE1, 0x89, 0x91, 0xE3, 0x73, 0xA9, 0xC3, 0x30,
-0x19, 0x99, 0x2E, 0x18, 0x99, 0x1E, 0x37, 0x3A,
-0x9C, 0x03, 0x30, 0x84, 0x33, 0x33, 0x92, 0x55,
-0x7E, 0xCF, 0x29, 0xD8, 0x49, 0x0D, 0xAE, 0xBD,
-0xAE, 0xAB, 0xC6, 0xBB, 0xAA, 0x68, 0x92, 0x92,
-0x6A, 0xBA, 0xB4, 0xE9, 0x11, 0x7A, 0x7C, 0xD8,
-0xC6, 0x84, 0x77, 0x12, 0x11, 0x87, 0xBC, 0x07,
-0x67, 0xAC, 0x47, 0xED, 0xD9, 0xD3, 0xC6, 0xAA,
-0x5E, 0x51, 0x6B, 0x11, 0xFB, 0x76, 0x74, 0xF1,
-0xAA, 0x97, 0x94, 0x33, 0x08, 0x00, 0xCE, 0xB1,
-0x1F, 0xB7, 0x67, 0x4F, 0x1A, 0xA9, 0x79, 0x41,
-0x9B, 0xC4, 0x6C, 0xDE, 0xC2, 0xCB, 0xF6, 0x75,
-0x92, 0x84, 0xA0, 0xE5, 0xEC, 0x12, 0xB2, 0x9D,
-0xEF, 0x76, 0xC9, 0xBA, 0x50, 0xAA, 0x92, 0xF1,
-0xA6, 0xAA, 0x69, 0x12, 0xF4, 0xA4, 0x36, 0x8A,
-0x2A, 0xB3, 0x60, 0x77, 0x3A, 0x34, 0xA3, 0x02,
-0x6D, 0x1A, 0xC8, 0x0C, 0xBD, 0xAC, 0x4E, 0xB9,
-0x0F, 0xBF, 0xF2, 0x46, 0x00, 0xB5, 0x88, 0xFD,
-0xBB, 0x3A, 0x78, 0xD5, 0x4B, 0xCA, 0x2D, 0x62,
-0x3F, 0x6E, 0xCE, 0x9E, 0x35, 0x52, 0xF2, 0x86,
-0x61, 0x00, 0x19, 0xD6, 0x23, 0xF6, 0xEC, 0xE9,
-0xE3, 0x55, 0x2F, 0x28, 0x33, 0x9A, 0xE3, 0x66,
-0xF6, 0x24, 0x97, 0x12, 0xCE, 0xC9, 0xEC, 0xCB,
-0x97, 0xD2, 0x49, 0x25, 0x15, 0xAA, 0xCF, 0x29,
-0x69, 0x42, 0xAA, 0xA5, 0x7C, 0x56, 0x92, 0x94,
-0xEE, 0x88, 0xF3, 0x4A, 0x71, 0xB4, 0x4E, 0x29,
-0xC6, 0xED, 0xDF, 0x46, 0x3B, 0x8A, 0x35, 0x90,
-0x19, 0x99, 0x2E, 0x18, 0x99, 0x1E, 0x37, 0x3A,
-0x9C, 0x01, 0x9B, 0xE4, 0x79, 0x73, 0x93, 0x59,
-0x69, 0xD9, 0x36, 0x65, 0x99, 0x62, 0x34, 0x1E,
-0x56, 0x95, 0xAD, 0x96, 0x75, 0x7B, 0xD6, 0x4F,
-0x94, 0x6F, 0x1A, 0xA3, 0x0C, 0x3C, 0xEE, 0x71,
-0xE6, 0x51, 0x45, 0x56, 0x6D, 0x22, 0xED, 0x29,
-0x29, 0x53, 0xFA, 0x4A, 0x41, 0xE2, 0xFC, 0xBB,
-0x3F, 0x77, 0x28, 0x66, 0x7B, 0x58, 0x9D, 0x72,
-0x1F, 0x7F, 0xE4, 0x8C, 0x0C, 0xC0, 0x31, 0x9F,
-0xCB, 0xB3, 0xF7, 0x72, 0x8F, 0x19, 0xB6, 0x76,
-0x8F, 0x61, 0x8B, 0x99, 0xDA, 0xDA, 0x16, 0x99,
-0xB7, 0xB0, 0x49, 0x2A, 0x74, 0x2D, 0x0C, 0x9D,
-0xD4, 0xAA, 0x92, 0x85, 0x39, 0x40, 0xD2, 0x9B,
-0xD7, 0x0C, 0x3C, 0xA7, 0x16, 0x27, 0x1C, 0x6A,
-0x5D, 0x91, 0xDF, 0x43, 0x70, 0xDC, 0xA2, 0x01,
-0x8C, 0xF5, 0xC1, 0xFE, 0xF1, 0x3F, 0xF3, 0x4F,
-0xFE, 0x07, 0xB5, 0x35, 0xC6, 0x31, 0xEC, 0x4A,
-0xCE, 0x25, 0x9D, 0x94, 0x19, 0x97, 0xD1, 0xA3,
-0x72, 0x4A, 0x5B, 0x55, 0x9E, 0x4D, 0xD1, 0x75,
-0x55, 0xBA, 0x88, 0x2D, 0x25, 0x21, 0xDD, 0x29,
-0xE7, 0x10, 0xE3, 0xA9, 0x1C, 0x43, 0x8E, 0xDB,
-0xBA, 0x94, 0x37, 0x10, 0x6B, 0x21, 0x00, 0x19,
-0xD5, 0xDB, 0xF6, 0xED, 0x17, 0xE0, 0xA5, 0x2F,
-0x30, 0x33, 0x9A, 0xE3, 0x18, 0xF6, 0x25, 0x67,
-0x12, 0xCE, 0xCA, 0x0C, 0xCB, 0xE8, 0xD1, 0xB9,
-0x25, 0x2D, 0xAA, 0xCF, 0x26, 0xE8, 0xBA, 0xAA,
-0xDD, 0x44, 0x16, 0x92, 0x90, 0xEE, 0x94, 0xF3,
-0x88, 0x71, 0xD4, 0x8E, 0x21, 0xC7, 0x6D, 0xDD,
-0x4A, 0x1B, 0x88, 0x35, 0x90, 0x19, 0x99, 0x2E,
-0x18, 0x99, 0x1E, 0x37, 0x3A, 0x9C, 0x03, 0x30,
-0x80, 0x04, 0xDB, 0x99, 0x69, 0x09, 0x8B, 0x7E,
-0xCF, 0x8D, 0x99, 0x66, 0x54, 0x6C, 0x12, 0x4A,
-0x9D, 0xC7, 0x67, 0x57, 0xAD, 0x3D, 0x25, 0x0A,
-0x6A, 0xA9, 0x4F, 0x3B, 0x9C, 0x79, 0x4A, 0x71,
-0x62, 0x71, 0xC7, 0x17, 0x69, 0x4B, 0xBF, 0xD4,
-0x1F, 0xC0, 0x43, 0x8C, 0x79, 0xAE, 0xB5, 0x84,
-0x79, 0x57, 0x7E, 0x9A, 0xC8, 0x57, 0xAD, 0xDD,
-0x5B, 0x64, 0xEB, 0x69, 0xD0, 0xD5, 0xD6, 0x50,
-0xA7, 0xF3, 0x47, 0x9B, 0x18, 0xD0, 0x33, 0x7C,
-0x61, 0x0D, 0x9F, 0x48, 0xEC, 0xC0, 0x03, 0x12,
-0xFB, 0x5E, 0xC3, 0x68, 0xCC, 0x2A, 0x34, 0xCC,
-0xCB, 0x83, 0xB7, 0xC9, 0x2B, 0x94, 0xEC, 0xEB,
-0x1A, 0x5E, 0xAA, 0x8E, 0x9D, 0x03, 0xCE, 0x30,
-0xEE, 0x69, 0xE8, 0xC8, 0x71, 0x20, 0x71, 0xA7,
-0x13, 0x69, 0x09, 0xBB, 0xD4, 0x03, 0xD9, 0xE4,
-0xB8, 0xE2, 0x7D, 0x86, 0xEF, 0x65, 0xDF, 0x8C,
-0x2E, 0x4B, 0x8E, 0x27, 0xD8, 0x6E, 0xF6, 0x5D,
-0xF8, 0xC2, 0xD6, 0x23, 0xF6, 0xEC, 0xE9, 0xE3,
-0x55, 0x2F, 0x28, 0xB5, 0x88, 0xFD, 0xBB, 0x3A,
-0x78, 0xD5, 0x4B, 0xCA, 0x02, 0xE4, 0xB8, 0xE2,
-0x7D, 0x86, 0xEF, 0x65, 0xDF, 0x8C, 0x0C, 0xE6,
-0xB8, 0xE1, 0x1D, 0x3B, 0x68, 0xE2, 0x59, 0xD6,
-0x99, 0xA6, 0x65, 0x2D, 0xF2, 0xB2, 0xE5, 0xAA,
-0xD0, 0xB1, 0x78, 0x2D, 0x23, 0xA7, 0x41, 0x69,
-0x29, 0x86, 0xF3, 0x4C, 0x48, 0x43, 0x49, 0x03,
-0x4D, 0x34, 0x9B, 0x08, 0x4D, 0xDE, 0xB0, 0x99,
-0xAC, 0x47, 0xED, 0xD9, 0xD3, 0xC6, 0xAA, 0x5E,
-0x50, 0x67, 0x35, 0xC6, 0xCD, 0xEC, 0x49, 0x2E,
-0x25, 0x9D, 0x93, 0xD9, 0x97, 0x2F, 0xA4, 0x92,
-0x4A, 0x2B, 0x55, 0x9E, 0x52, 0xD2, 0x85, 0x55,
-0x4A, 0xF8, 0xAD, 0x25, 0x29, 0xDD, 0x11, 0xE6,
-0x94, 0xE3, 0x68, 0x9C, 0x53, 0x8D, 0xDB, 0xBE,
-0x8C, 0x77, 0x14, 0x04, 0xF1, 0x1C, 0x23, 0xA7,
-0x92, 0x5F, 0xB3, 0xAC, 0x66, 0x64, 0xF6, 0x52,
-0xA6, 0x49, 0x97, 0xAF, 0x7B, 0xC9, 0x5E, 0xF0,
-0x5A, 0x3A, 0xBE, 0xA1, 0x54, 0xD3, 0xD1, 0x73,
-0x8A, 0x90, 0xA7, 0x1B, 0x44, 0xE2, 0x94, 0xBC,
-0xD2, 0x92, 0x3F, 0x4C, 0x48, 0x13, 0x39, 0x2E,
-0x38, 0x9F, 0x61, 0xBB, 0xD9, 0x77, 0xE3, 0x01,
-0x97, 0xF4, 0xF7, 0x1B, 0xB6, 0x51, 0xE7, 0xBB,
-0x76, 0xD5, 0xB5, 0x74, 0xB7, 0x15, 0xCD, 0x7A,
-0x59, 0x15, 0x34, 0x89, 0x02, 0xCD, 0xBA, 0xB9,
-0x02, 0x34, 0x47, 0xF3, 0xD1, 0x18, 0x5A, 0xBA,
-0x14, 0x8C, 0x2E, 0xD2, 0x16, 0x95, 0x28, 0x12,
-0x10, 0x29, 0x46, 0xCC, 0x00, 0x33, 0xC9, 0x71,
-0xC4, 0xFB, 0x0D, 0xDE, 0xCB, 0xBF, 0x18, 0x5C,
-0x97, 0x1C, 0x4F, 0xB0, 0xDD, 0xEC, 0xBB, 0xF1,
-0x83, 0x30, 0x80, 0x0C, 0xF2, 0x5C, 0x71, 0x3E,
-0xC3, 0x77, 0xB2, 0xEF, 0xC6, 0x17, 0x25, 0xC7,
-0x13, 0xEC, 0x37, 0x7B, 0x2E, 0xFC, 0x60, 0xCC,
-0x20, 0x03, 0x3C, 0x97, 0x1C, 0x4F, 0xB0, 0xDD,
-0xEC, 0xBB, 0xF1, 0x81, 0x9C, 0xD7, 0x1C, 0x23,
-0xA7, 0x6D, 0x1C, 0x4B, 0x3A, 0xD3, 0x34, 0xCC,
-0xA5, 0xBE, 0x56, 0x5C, 0xB5, 0x5A, 0x16, 0x2F,
-0x05, 0xA4, 0x74, 0xE8, 0x2D, 0x25, 0x30, 0xDE,
-0x69, 0x89, 0x08, 0x69, 0x20, 0x69, 0xA6, 0x93,
-0x61, 0x09, 0xBB, 0xD6, 0x35, 0x90, 0x19, 0x99,
-0x2E, 0x18, 0x99, 0x1E, 0x37, 0x3A, 0x9C, 0x07,
-0x8D, 0x36, 0xE6, 0xA6, 0x42, 0x6D, 0x1F, 0xB3,
-0xE3, 0x69, 0x99, 0x95, 0xEB, 0x7C, 0x92, 0xB9,
-0x71, 0xD9, 0xD6, 0x2A, 0x8F, 0x47, 0x4E, 0x82,
-0xAA, 0x53, 0x0E, 0xE6, 0x9E, 0x42, 0x1C, 0x48,
-0x1C, 0x69, 0xC4, 0xDA, 0x42, 0x6E, 0xF5, 0x07,
-0xF1, 0x08, 0x00, 0xCB, 0x40, 0xF7, 0x1B, 0xBD,
-0x67, 0xB4, 0xEC, 0x53, 0x14, 0xE9, 0x74, 0xAB,
-0x47, 0x2C, 0x96, 0xB5, 0xBD, 0x22, 0x40, 0xA5,
-0xFD, 0xE1, 0x01, 0x12, 0x99, 0xCC, 0x4A, 0x67,
-0xFC, 0xC9, 0xB0, 0xA5, 0xF4, 0x62, 0x58, 0x44,
-0x84, 0x06, 0x73, 0x5C, 0x6C, 0xDE, 0xC4, 0x92,
-0xE2, 0x59, 0xD9, 0x3D, 0x99, 0x72, 0xFA, 0x49,
-0x24, 0xA2, 0xB5, 0x59, 0xE5, 0x2D, 0x28, 0x55,
-0x54, 0xAF, 0x8A, 0xD2, 0x52, 0x9D, 0xD1, 0x1E,
-0x69, 0x4E, 0x36, 0x89, 0xC5, 0x38, 0xDD, 0xBB,
-0xE8, 0xC7, 0x71, 0x42, 0x63, 0xA5, 0xC4, 0xEB,
-0xEF, 0xFB, 0x83, 0x24, 0x78, 0xA6, 0x4B, 0x86,
-0x26, 0x47, 0x8D, 0xCE, 0xA7, 0x01, 0x6B, 0x11,
-0xFB, 0x76, 0x74, 0xF1, 0xAA, 0x97, 0x94, 0x5A,
-0xC4, 0x7E, 0xDD, 0x9D, 0x3C, 0x6A, 0xA5, 0xE5,
-0x0C, 0xC2, 0x00, 0x33, 0xAC, 0x47, 0xED, 0xD9,
-0xD3, 0xC6, 0xAA, 0x5E, 0x50, 0x67, 0x35, 0xC6,
-0xCD, 0xEC, 0x49, 0x2E, 0x25, 0x9D, 0x93, 0xD9,
-0x97, 0x2F, 0xA4, 0x92, 0x4A, 0x2B, 0x55, 0x9E,
-0x52, 0xD2, 0x85, 0x55, 0x4A, 0xF8, 0xAD, 0x25,
-0x29, 0xDD, 0x11, 0xE6, 0x94, 0xE3, 0x68, 0x9C,
-0x53, 0x8D, 0xDB, 0xBE, 0x8C, 0x77, 0x14, 0x6B,
-0x20, 0x33, 0x32, 0x5C, 0x31, 0x32, 0x3C, 0x6E,
-0x75, 0x38, 0x0C, 0xCD, 0x3E, 0x76, 0x89, 0xBB,
-0x97, 0xF4, 0x3B, 0x4D, 0x5D, 0xD6, 0x86, 0xD4,
-0x5B, 0xAC, 0x9F, 0xC6, 0x90, 0x2F, 0xDA, 0xA9,
-0x59, 0xE9, 0xFC, 0xD1, 0x09, 0x42, 0x8C, 0x0C,
-0xDF, 0xBE, 0x9E, 0xCD, 0xC5, 0x1A, 0x67, 0x58,
-0x8F, 0xDB, 0xB3, 0xA7, 0x8D, 0x54, 0xBC, 0xA3,
-0x8C, 0xFE, 0xD0, 0x76, 0x16, 0xFF, 0x00, 0x76,
-0x0A, 0xAD, 0xAD, 0xE9, 0x66, 0xD1, 0x5A, 0x7D,
-0x52, 0xCF, 0x4E, 0xD5, 0x6A, 0x4E, 0xAC, 0x8B,
-0xD3, 0xA4, 0x4A, 0x14, 0x61, 0x1D, 0xC7, 0x47,
-0x76, 0xCD, 0xE2, 0x7D, 0xAA, 0xAF, 0xD9, 0xDA,
-0xBB, 0x09, 0x5D, 0xB5, 0xD7, 0xB5, 0xEB, 0x77,
-0x54, 0xF5, 0x4D, 0x12, 0x52, 0x43, 0x59, 0x58,
-0x9D, 0x1A, 0x2F, 0x4F, 0x9D, 0x08, 0x53, 0x8E,
-0xE2, 0xC6, 0x10, 0xF7, 0x80, 0xEC, 0xF5, 0x88,
-0xFD, 0xBB, 0x3A, 0x78, 0xD5, 0x4B, 0xCA, 0x2D,
-0x62, 0x3F, 0x6E, 0xCE, 0x9E, 0x35, 0x52, 0xF2,
-0x8C, 0x67, 0xCA, 0x8D, 0xFB, 0x7B, 0x73, 0xDD,
-0x2A, 0x5F, 0x04, 0x5C, 0xA8, 0xDF, 0xB7, 0xB7,
-0x3D, 0xD2, 0xA5, 0xF0, 0x40, 0x6C, 0xCD, 0x62,
-0x3F, 0x6E, 0xCE, 0x9E, 0x35, 0x52, 0xF2, 0x8B,
-0x58, 0x8F, 0xDB, 0xB3, 0xA7, 0x8D, 0x54, 0xBC,
-0xA3, 0x33, 0x3B, 0x27, 0xA5, 0x3B, 0x17, 0x95,
-0x78, 0x68, 0x54, 0xBB, 0x7A, 0xDD, 0xD5, 0x56,
-0xBE, 0xA9, 0x25, 0xA1, 0xAB, 0xAC, 0xA7, 0x43,
-0xE7, 0x4C, 0x36, 0x31, 0xA0, 0x7E, 0xE8, 0xC2,
-0x1B, 0x7E, 0x81, 0xD9, 0xFC, 0xBB, 0x3F, 0x77,
-0x28, 0x06, 0x6D, 0x62, 0x3F, 0x6E, 0xCE, 0x9E,
-0x35, 0x52, 0xF2, 0x83, 0x39, 0xAE, 0x36, 0x6F,
-0x62, 0x49, 0x71, 0x2C, 0xEC, 0x9E, 0xCC, 0xB9,
-0x7D, 0x24, 0x92, 0x51, 0x5A, 0xAC, 0xF2, 0x96,
-0x94, 0x2A, 0xAA, 0x57, 0xC5, 0x69, 0x29, 0x4E,
-0xE8, 0x8F, 0x34, 0xA7, 0x1B, 0x44, 0xE2, 0x9C,
-0x6E, 0xDD, 0xF4, 0x63, 0xB8, 0xA3, 0xC5, 0xF9,
-0x76, 0x7E, 0xEE, 0x51, 0xC6, 0x39, 0x2E, 0x56,
-0x3A, 0xB0, 0x92, 0x35, 0x69, 0xFE, 0x53, 0xE9,
-0xAC, 0x1F, 0xE1, 0x7F, 0xEB, 0xA4, 0xAC, 0xF9,
-0xFE, 0x93, 0xE7, 0x2B, 0x3D, 0x2F, 0xFA, 0xD9,
-0x00, 0x1B, 0xFC, 0x42, 0x10, 0x0C, 0x9A, 0xD4,
-0xBE, 0x39, 0x09, 0xCF, 0xBF, 0x67, 0xD5, 0x28,
-0x4A, 0x08, 0x6D, 0xF2, 0xB2, 0xE5, 0xC3, 0x76,
-0xC9, 0xB4, 0x8F, 0x47, 0x6B, 0xA0, 0xAA, 0x42,
-0x25, 0xE9, 0x48, 0x8C, 0xF3, 0x4C, 0xA0, 0x6A,
-0x42, 0x1D, 0xCE, 0x84, 0x61, 0x02, 0x6D, 0xDC,
-0x64, 0xE4, 0xA7, 0x5B, 0xAB, 0x57, 0x61, 0x24,
-0x31, 0x5A, 0x05, 0x7A, 0xDD, 0xD5, 0xDD, 0x6E,
-0xF7, 0xA9, 0xAC, 0xAC, 0x4E, 0x91, 0x2F, 0xA1,
-0x52, 0x74, 0x21, 0x4E, 0x1B, 0xCB, 0x18, 0x47,
-0xDC, 0x34, 0xCC, 0xF6, 0xB0, 0xC4, 0xD7, 0x70,
-0x59, 0xD4, 0x02, 0x99, 0x2E, 0x18, 0x99, 0x1E,
-0x37, 0x3A, 0x9C, 0x00, 0xCF, 0x2E, 0x7F, 0xB2,
-0xEE, 0xFF, 0x00, 0xFD, 0x38, 0xB9, 0x73, 0xFD,
-0x97, 0x77, 0xFF, 0x00, 0xE9, 0xC6, 0xCC, 0x10,
-0x0C, 0x67, 0xCB, 0x9F, 0xEC, 0xBB, 0xBF, 0xFF,
-0x00, 0x4E, 0x38, 0xC7, 0x25, 0x3A, 0xDD, 0x5A,
-0xBB, 0x09, 0x21, 0x8A, 0xD0, 0x2B, 0xD6, 0xEE,
-0xAE, 0xEB, 0x77, 0xBD, 0x4D, 0x65, 0x62, 0x74,
-0x89, 0x7D, 0x0A, 0x93, 0xA1, 0x0A, 0x70, 0xDE,
-0x58, 0xC2, 0x3E, 0xE1, 0xBF, 0xC0, 0xCC, 0xC9,
-0x70, 0xC4, 0xC8, 0xF1, 0xB9, 0xD4, 0xE0, 0x33,
-0x33, 0xED, 0x9D, 0x6E, 0xB2, 0x9D, 0x84, 0xAE,
-0xC5, 0x68, 0x15, 0xD5, 0x78, 0xD4, 0xF5, 0xBB,
-0xDE, 0xBA, 0xAE, 0xAD, 0x3A, 0x34, 0xBE, 0x85,
-0x49, 0xB1, 0x8D, 0x08, 0x6F, 0x24, 0x23, 0x1F,
-0x70, 0x9F, 0x6C, 0xEB, 0x75, 0x94, 0xEC, 0x25,
-0x76, 0x2B, 0x40, 0xAE, 0xAB, 0xC6, 0xA7, 0xAD,
-0xDE, 0xF5, 0xD5, 0x75, 0x69, 0xD1, 0xA5, 0xF4,
-0x2A, 0x4D, 0x8C, 0x68, 0x43, 0x79, 0x21, 0x18,
-0xFB, 0x86, 0x99, 0x9E, 0xD6, 0x18, 0x9A, 0xEE,
-0x0B, 0x3A, 0x80, 0x53, 0xDA, 0xC3, 0x13, 0x5D,
-0xC1, 0x67, 0x50, 0x00, 0xCC, 0xCE, 0x4A, 0x75,
-0xBA, 0xB5, 0x76, 0x12, 0x43, 0x15, 0xA0, 0x57,
-0xAD, 0xDD, 0x5D, 0xD6, 0xEF, 0x7A, 0x9A, 0xCA,
-0xC4, 0xE9, 0x12, 0xFA, 0x15, 0x27, 0x42, 0x14,
-0xE1, 0xBC, 0xB1, 0x84, 0x7D, 0xC3, 0xB3, 0xE5,
-0xCF, 0xF6, 0x5D, 0xDF, 0xFF, 0x00, 0xA7, 0x0C,
-0xD3, 0x25, 0xC3, 0x13, 0x23, 0xC6, 0xE7, 0x53,
-0x86, 0x60, 0x18, 0x01, 0x92, 0x9D, 0x6D, 0xC0,
-0xF3, 0xDB, 0x76, 0xD7, 0x40, 0xAD, 0x3A, 0x55,
-0x60, 0xEA, 0x97, 0xBD, 0x0B, 0x2D, 0x95, 0x01,
-0x51, 0x7A, 0x75, 0x25, 0xA7, 0x4A, 0x31, 0xDC,
-0x6C, 0x37, 0x6D, 0xDE, 0x3B, 0x3E, 0x5C, 0xFF,
-0x00, 0x65, 0xDD, 0xFF, 0x00, 0xFA, 0x70, 0xCC,
-0xE9, 0x71, 0x3A, 0xFB, 0xFE, 0xE0, 0xC9, 0x1E,
-0x19, 0x80, 0x63, 0x3E, 0x5C, 0xFF, 0x00, 0x65,
-0xDD, 0xFF, 0x00, 0xFA, 0x71, 0xC6, 0x39, 0x29,
-0xD6, 0xEA, 0xD5, 0xD8, 0x49, 0x0C, 0x56, 0x81,
-0x5E, 0xB7, 0x75, 0x77, 0x5B, 0xBD, 0xEA, 0x6B,
-0x2B, 0x13, 0xA4, 0x4B, 0xE8, 0x54, 0x9D, 0x08,
-0x53, 0x86, 0xF2, 0xC6, 0x11, 0xF7, 0x0D, 0xFE,
-0x06, 0x66, 0x4B, 0x86, 0x26, 0x47, 0x8D, 0xCE,
-0xA7, 0x00, 0xCC, 0x21, 0x08, 0x00, 0xCC, 0xF6,
-0xB0, 0xC4, 0xD7, 0x70, 0x59, 0xD4, 0x02, 0x99,
-0x2E, 0x18, 0x99, 0x1E, 0x37, 0x3A, 0x9C, 0x53,
-0xDA, 0xC3, 0x13, 0x5D, 0xC1, 0x67, 0x50, 0x0A,
-0x64, 0xB8, 0x62, 0x64, 0x78, 0xDC, 0xEA, 0x70,
-0x0C, 0xC2, 0x10, 0x80, 0x40, 0x66, 0x64, 0xB8,
-0x62, 0x64, 0x78, 0xDC, 0xEA, 0x70, 0xCC, 0x06,
-0x66, 0x4B, 0x86, 0x26, 0x47, 0x8D, 0xCE, 0xA7,
-0x01, 0x4F, 0x6B, 0x0C, 0x4D, 0x77, 0x05, 0x9D,
-0x40, 0x29, 0xED, 0x61, 0x89, 0xAE, 0xE0, 0xB3,
-0xA8, 0x05, 0x3D, 0xAC, 0x31, 0x35, 0xDC, 0x16,
-0x75, 0x00, 0xA7, 0xB5, 0x86, 0x26, 0xBB, 0x82,
-0xCE, 0xA0, 0x01, 0x4C, 0x97, 0x0C, 0x4C, 0x8F,
-0x1B, 0x9D, 0x4E, 0x19, 0x86, 0x4D, 0x9A, 0xE3,
-0xFB, 0x74, 0xEC, 0x5B, 0x89, 0x67, 0x59, 0x96,
-0x99, 0xAB, 0xB0, 0x4A, 0xCA, 0x76, 0xAB, 0x42,
-0xBD, 0xDE, 0xB4, 0x92, 0x85, 0x35, 0xA4, 0xA7,
-0x9B, 0xCE, 0x31, 0x19, 0x4D, 0x2C, 0x4D, 0x38,
-0xD2, 0xEC, 0x29, 0x77, 0xFA, 0xC2, 0x67, 0x2A,
-0x37, 0x13, 0xED, 0xCF, 0x74, 0xAE, 0xFC, 0x10,
-0x03, 0x33, 0x80, 0xFA, 0xCE, 0xFE, 0x13, 0xFC,
-0xB0, 0xCD, 0x32, 0x5C, 0x31, 0x32, 0x3C, 0x6E,
-0x75, 0x38, 0x00, 0x79, 0x2D, 0x4C, 0x84, 0xDA,
-0x33, 0x13, 0x91, 0x69, 0x99, 0x95, 0xEB, 0x7C,
-0x92, 0xB9, 0xA2, 0xF6, 0x75, 0x8A, 0xA3, 0xD1,
-0xD3, 0xA0, 0x79, 0xA6, 0x1D, 0xCD, 0x3C, 0x84,
-0x38, 0x90, 0x38, 0xD3, 0x89, 0xB4, 0x84, 0xDD,
-0xEA, 0x0F, 0xF3, 0x25, 0xC3, 0x13, 0x23, 0xC6,
-0xE7, 0x53, 0x80, 0x66, 0x03, 0x33, 0x25, 0xC3,
-0x13, 0x23, 0xC6, 0xE7, 0x53, 0x86, 0x60, 0x33,
-0x32, 0x5C, 0x31, 0x32, 0x3C, 0x6E, 0x75, 0x38,
-0x06, 0x61, 0x08, 0x40, 0x06, 0x67, 0xB5, 0x86,
-0x26, 0xBB, 0x82, 0xCE, 0xA0, 0x14, 0xC9, 0x70,
-0xC4, 0xC8, 0xF1, 0xB9, 0xD4, 0xE2, 0x9E, 0xD6,
-0x18, 0x9A, 0xEE, 0x0B, 0x3A, 0x80, 0x53, 0x25,
-0xC3, 0x13, 0x23, 0xC6, 0xE7, 0x53, 0x80, 0x66,
-0x10, 0x84, 0x02, 0x03, 0x33, 0x25, 0xC3, 0x13,
-0x23, 0xC6, 0xE7, 0x53, 0x86, 0x60, 0x33, 0x32,
-0x5C, 0x31, 0x32, 0x3C, 0x6E, 0x75, 0x38, 0x0A,
-0x7B, 0x58, 0x62, 0x6B, 0xB8, 0x2C, 0xEA, 0x01,
-0x4F, 0x6B, 0x0C, 0x4D, 0x77, 0x05, 0x9D, 0x40,
-0x29, 0xED, 0x61, 0x89, 0xAE, 0xE0, 0xB3, 0xA8,
-0x05, 0x3D, 0xAC, 0x31, 0x35, 0xDC, 0x16, 0x75,
-0x00, 0x06, 0x61, 0x08, 0x40, 0x31, 0x9C, 0xEB,
-0x65, 0x86, 0xEE, 0x5F, 0xD7, 0x2C, 0x93, 0xA6,
-0x36, 0x66, 0x4D, 0x95, 0xB8, 0xFF, 0x00, 0x82,
-0xDD, 0x88, 0x0F, 0xB5, 0x5A, 0xAA, 0x4E, 0xF9,
-0xF8, 0x11, 0x21, 0x94, 0x52, 0x12, 0x9E, 0xF3,
-0xA3, 0xBB, 0x61, 0x07, 0xB5, 0x35, 0xC6, 0x31,
-0xEC, 0x4A, 0xCE, 0x25, 0x9D, 0x94, 0x19, 0x97,
-0xD1, 0xA3, 0x72, 0x4A, 0x5B, 0x55, 0x9E, 0x4D,
-0xD1, 0x75, 0x55, 0xBA, 0x88, 0x2D, 0x25, 0x21,
-0xDD, 0x29, 0xE7, 0x10, 0xE3, 0xA9, 0x1C, 0x43,
-0x8E, 0xDB, 0xBA, 0x94, 0x37, 0x10, 0x78, 0xB3,
-0x80, 0xFA, 0xCE, 0xFE, 0x13, 0xFC, 0xB0, 0xCD,
-0x32, 0x5C, 0x31, 0x32, 0x3C, 0x6E, 0x75, 0x38,
-0x0B, 0x57, 0x6F, 0xDB, 0xB4, 0x5F, 0x82, 0x94,
-0xBC, 0xC0, 0xCE, 0x6B, 0x8C, 0x63, 0xD8, 0x95,
-0x9C, 0x4B, 0x3B, 0x28, 0x33, 0x2F, 0xA3, 0x46,
-0xE4, 0x94, 0xB6, 0xAB, 0x3C, 0x9B, 0xA2, 0xEA,
-0xAB, 0x75, 0x10, 0x5A, 0x4A, 0x43, 0xBA, 0x53,
-0xCE, 0x21, 0xC7, 0x52, 0x38, 0x87, 0x1D, 0xB7,
-0x75, 0x28, 0x6E, 0x20, 0xD6, 0x40, 0x66, 0x64,
-0xB8, 0x62, 0x64, 0x78, 0xDC, 0xEA, 0x70, 0x16,
-0xB1, 0x1F, 0xB7, 0x67, 0x4F, 0x1A, 0xA9, 0x79,
-0x45, 0xAC, 0x47, 0xED, 0xD9, 0xD3, 0xC6, 0xAA,
-0x5E, 0x50, 0xCC, 0x20, 0x19, 0x36, 0x74, 0x6D,
-0x9B, 0xD8, 0x95, 0x9C, 0x4B, 0x45, 0x27, 0xB4,
-0xCE, 0x5F, 0x46, 0xE4, 0x94, 0xB6, 0x5B, 0x44,
-0xA5, 0xA5, 0x0A, 0xAB, 0x75, 0x10, 0x5A, 0x44,
-0x53, 0x7A, 0x23, 0x0D, 0x21, 0xC7, 0x52, 0x38,
-0x86, 0x9B, 0xB3, 0x75, 0x28, 0xEE, 0x20, 0xA6,
-0xB8, 0xD9, 0xBD, 0x89, 0x25, 0xC4, 0xB3, 0xB2,
-0x7B, 0x32, 0xE5, 0xF4, 0x92, 0x49, 0x45, 0x6A,
-0xB3, 0xCA, 0x5A, 0x50, 0xAA, 0xA9, 0x5F, 0x15,
-0xA4, 0xA5, 0x3B, 0xA2, 0x3C, 0xD2, 0x9C, 0x6D,
-0x13, 0x8A, 0x71, 0xBB, 0x77, 0xD1, 0x8E, 0xE2,
-0x84, 0xC9, 0xED, 0x61, 0x89, 0xAE, 0xE0, 0xB3,
-0xA8, 0x05, 0x32, 0x5C, 0x31, 0x32, 0x3C, 0x6E,
-0x75, 0x38, 0x0B, 0x58, 0x8F, 0xDB, 0xB3, 0xA7,
-0x8D, 0x54, 0xBC, 0xA2, 0xD6, 0x23, 0xF6, 0xEC,
-0xE9, 0xE3, 0x55, 0x2F, 0x28, 0x66, 0x10, 0x01,
-0x9D, 0x62, 0x3F, 0x6E, 0xCE, 0x9E, 0x35, 0x52,
-0xF2, 0x8F, 0x6A, 0x6B, 0x8C, 0xB4, 0xBA, 0xC5,
-0xB8, 0x96, 0x75, 0x99, 0x69, 0x94, 0x6C, 0x12,
-0xB2, 0x9D, 0xAA, 0xD0, 0xAF, 0x5A, 0x62, 0x4A,
-0x14, 0xD6, 0x92, 0x9E, 0x6F, 0x38, 0xC2, 0x94,
-0xD2, 0xC4, 0xD3, 0x8D, 0x2E, 0xC2, 0x97, 0x7F,
-0xAC, 0x26, 0x08, 0x00, 0xCC, 0xF6, 0xB0, 0xC4,
-0xD7, 0x70, 0x59, 0xD4, 0x02, 0x9E, 0xD6, 0x18,
-0x9A, 0xEE, 0x0B, 0x3A, 0x80, 0x53, 0xDA, 0xC3,
-0x13, 0x5D, 0xC1, 0x67, 0x50, 0x0A, 0x7B, 0x58,
-0x62, 0x6B, 0xB8, 0x2C, 0xEA, 0x00, 0x0C, 0xC2,
-0x10, 0x80, 0x63, 0x39, 0xC0, 0x7D, 0x67, 0x7F,
-0x09, 0xFE, 0x58, 0x66, 0x99, 0x2E, 0x18, 0x99,
-0x1E, 0x37, 0x3A, 0x9C, 0x0C, 0xCE, 0x03, 0xEB,
-0x3B, 0xF8, 0x4F, 0xF2, 0xC3, 0x34, 0xC9, 0x70,
-0xC4, 0xC8, 0xF1, 0xB9, 0xD4, 0xE0, 0x19, 0x80,
-0xCC, 0xC9, 0x70, 0xC4, 0xC8, 0xF1, 0xB9, 0xD4,
-0xE1, 0x98, 0x0C, 0xCC, 0x97, 0x0C, 0x4C, 0x8F,
-0x1B, 0x9D, 0x4E, 0x03, 0xFF, 0xD9};
-static const int goodJpegImageWidth = 128;
-static const int goodJpegImageHeight = 128;
-
-// https://code.google.com/p/android/issues/detail?id=42382
-// https://code.google.com/p/android/issues/detail?id=9064
-// https://code.google.com/p/skia/issues/detail?id=1649
-
-/**
-  This test will test the ability of the SkImageDecoder to deal with
-  Jpeg files which have been mangled somehow.  We want to display as
-  much of the jpeg as possible.
-*/
-DEF_TEST(Jpeg, reporter) {
-    size_t len = sizeof(goodJpegImage) / 2;
-    // I am explicitly not putting the entire image into the
-    // DecodeMemory.  This simulates a network error.
-
-    SkBitmap bm8888;
-    bool imageDecodeSuccess = SkImageDecoder::DecodeMemory(
-        static_cast<void *>(goodJpegImage), len, &bm8888);
-    REPORTER_ASSERT(reporter, imageDecodeSuccess);
-    REPORTER_ASSERT(reporter, bm8888.width() == goodJpegImageWidth);
-    REPORTER_ASSERT(reporter, bm8888.height() == goodJpegImageHeight);
-    REPORTER_ASSERT(reporter, !(bm8888.empty()));
-
-    // Pick a few pixels and verify that their colors match the colors
-    // we expect (given the original image).
-    REPORTER_ASSERT(reporter, bm8888.getColor(7, 9) == 0xffffffff);
-    REPORTER_ASSERT(reporter, bm8888.getColor(28, 3) == 0xff000000);
-    REPORTER_ASSERT(reporter, bm8888.getColor(27, 34) == 0xffffffff);
-    REPORTER_ASSERT(reporter, bm8888.getColor(71, 18) == 0xff000000);
-
-#ifdef SK_BUILD_FOR_IOS  // the iOS jpeg decoder fills to gray
-    REPORTER_ASSERT(reporter, bm8888.getColor(127, 127) == 0xff808080
-            || bm8888.getColor(127, 127) == SK_ColorWHITE);
-#else
-    // This is the fill color
-    REPORTER_ASSERT(reporter, bm8888.getColor(127, 127) == SK_ColorWHITE);
-#endif
-
-    #if JPEG_TEST_WRITE_TO_FILE_FOR_DEBUGGING
-    // Check to see that the resulting bitmap is nice
-    bool writeSuccess = (!(bm8888.empty())) && SkImageEncoder::EncodeFile(
-        "HalfOfAJpeg.png", bm8888, SkImageEncoder::kPNG_Type, 100);
-    SkASSERT(writeSuccess);
-    #endif
-}
-
-DEF_TEST(Jpeg_YUV, reporter) {
-    size_t len = sizeof(goodJpegImage);
-    SkMemoryStream* stream = new SkMemoryStream(goodJpegImage, len);
-    SkDecodingImageGenerator::Options opts;
-    SkAutoTDelete<SkImageGenerator> gen(SkDecodingImageGenerator::Create(stream, opts));
-    REPORTER_ASSERT(reporter, gen);
-    if (!gen) {
-        return;
-    }
-
-    SkISize yuvSizes[3];
-    bool sizesComputed = gen->getYUV8Planes(yuvSizes, nullptr, nullptr, nullptr);
-    REPORTER_ASSERT(reporter, sizesComputed);
-    if (!sizesComputed) {
-        return;
-    }
-
-    // Allocate the memory for YUV
-    size_t totalSize(0);
-    size_t sizes[3], rowBytes[3];
-    const int32_t expected_sizes[] = {128, 64, 64};
-    for (int i = 0; i < 3; ++i) {
-        rowBytes[i] = yuvSizes[i].fWidth;
-        totalSize  += sizes[i] = rowBytes[i] * yuvSizes[i].fHeight;
-        REPORTER_ASSERT(reporter, rowBytes[i]         == (size_t)expected_sizes[i]);
-        REPORTER_ASSERT(reporter, yuvSizes[i].fWidth  == expected_sizes[i]);
-        REPORTER_ASSERT(reporter, yuvSizes[i].fHeight == expected_sizes[i]);
-    }
-    SkAutoMalloc storage(totalSize);
-    void* planes[3];
-    planes[0] = storage.get();
-    planes[1] = (uint8_t*)planes[0] + sizes[0];
-    planes[2] = (uint8_t*)planes[1] + sizes[1];
-
-    // Get the YUV planes
-    REPORTER_ASSERT(reporter, gen->getYUV8Planes(yuvSizes, planes, rowBytes, nullptr));
-}
-
-static SkStreamAsset* resource(const char path[]) {
-    SkString fullPath = GetResourcePath(path);
-    return SkStream::NewFromFile(fullPath.c_str());
-}
-
-static void codec_yuv(skiatest::Reporter* reporter,
-                  const char path[],
-                  SkISize expectedSizes[3]) {
-    SkAutoTDelete<SkStream> stream(resource(path));
-    if (!stream) {
-        SkDebugf("Missing resource '%s'\n", path);
-        return;
-    }
-    SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream.detach()));
-    REPORTER_ASSERT(reporter, codec);
-    if (!codec) {
-        return;
-    }
-
-    // Test queryYUV8()
-    SkCodec::YUVSizeInfo info;
-    bool success = codec->queryYUV8(nullptr, nullptr);
-    REPORTER_ASSERT(reporter, !success);
-    success = codec->queryYUV8(&info, nullptr);
-    REPORTER_ASSERT(reporter, (expectedSizes == nullptr) == !success);
-    if (!success) {
-        return;
-    }
-    REPORTER_ASSERT(reporter,
-            0 == memcmp((const void*) &info, (const void*) expectedSizes, 3 * sizeof(SkISize)));
-    REPORTER_ASSERT(reporter, info.fYWidthBytes == (uint32_t) SkAlign8(info.fYSize.width()));
-    REPORTER_ASSERT(reporter, info.fUWidthBytes == (uint32_t) SkAlign8(info.fUSize.width()));
-    REPORTER_ASSERT(reporter, info.fVWidthBytes == (uint32_t) SkAlign8(info.fVSize.width()));
-    SkYUVColorSpace colorSpace;
-    success = codec->queryYUV8(&info, &colorSpace);
-    REPORTER_ASSERT(reporter,
-            0 == memcmp((const void*) &info, (const void*) expectedSizes, 3 * sizeof(SkISize)));
-    REPORTER_ASSERT(reporter, info.fYWidthBytes == (uint32_t) SkAlign8(info.fYSize.width()));
-    REPORTER_ASSERT(reporter, info.fUWidthBytes == (uint32_t) SkAlign8(info.fUSize.width()));
-    REPORTER_ASSERT(reporter, info.fVWidthBytes == (uint32_t) SkAlign8(info.fVSize.width()));
-    REPORTER_ASSERT(reporter, kJPEG_SkYUVColorSpace == colorSpace);
-
-    // Allocate the memory for the YUV decode
-    size_t totalBytes = info.fYWidthBytes * info.fYSize.height() +
-            info.fUWidthBytes * info.fUSize.height() +
-            info.fVWidthBytes * info.fVSize.height();
-    SkAutoMalloc storage(totalBytes);
-    void* planes[3];
-    planes[0] = storage.get();
-    planes[1] = SkTAddOffset<void>(planes[0], info.fYWidthBytes * info.fYSize.height());
-    planes[2] = SkTAddOffset<void>(planes[1], info.fUWidthBytes * info.fUSize.height());
-
-    // Test getYUV8Planes()
-    REPORTER_ASSERT(reporter, SkCodec::kInvalidInput ==
-            codec->getYUV8Planes(info, nullptr));
-    REPORTER_ASSERT(reporter, SkCodec::kSuccess ==
-            codec->getYUV8Planes(info, planes));
-}
-
-DEF_TEST(Jpeg_YUV_Codec, r) {
-    SkISize sizes[3];
-
-    sizes[0].set(128, 128);
-    sizes[1].set(64, 64);
-    sizes[2].set(64, 64);
-    codec_yuv(r, "color_wheel.jpg", sizes);
-
-    // H2V2
-    sizes[0].set(512, 512);
-    sizes[1].set(256, 256);
-    sizes[2].set(256, 256);
-    codec_yuv(r, "mandrill_512_q075.jpg", sizes);
-
-    // H1V1
-    sizes[1].set(512, 512);
-    sizes[2].set(512, 512);
-    codec_yuv(r, "mandrill_h1v1.jpg", sizes);
-
-    // H2V1
-    sizes[1].set(256, 512);
-    sizes[2].set(256, 512);
-    codec_yuv(r, "mandrill_h2v1.jpg", sizes);
-
-    // Non-power of two dimensions
-    sizes[0].set(439, 154);
-    sizes[1].set(220, 77);
-    sizes[2].set(220, 77);
-    codec_yuv(r, "cropped_mandrill.jpg", sizes);
-
-    sizes[0].set(8, 8);
-    sizes[1].set(4, 4);
-    sizes[2].set(4, 4);
-    codec_yuv(r, "randPixels.jpg", sizes);
-
-    // Progressive images
-    sizes[0].set(512, 512);
-    sizes[1].set(512, 512);
-    sizes[2].set(512, 512);
-    codec_yuv(r, "brickwork-texture.jpg", sizes);
-    codec_yuv(r, "brickwork_normal-map.jpg", sizes);
-
-    // A CMYK encoded image should fail.
-    codec_yuv(r, "CMYK.jpg", nullptr);
-    // A grayscale encoded image should fail.
-    codec_yuv(r, "grayscale.jpg", nullptr);
-    // A PNG should fail.
-    codec_yuv(r, "arrow.png", nullptr);
-}
diff --git a/tests/YUVTest.cpp b/tests/YUVTest.cpp
new file mode 100644
index 0000000000..09b6f2a7ef
--- /dev/null
+++ b/tests/YUVTest.cpp
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCodec.h"
+#include "Resources.h"
+#include "SkStream.h"
+#include "SkTemplates.h"
+#include "Test.h"
+
+static SkStreamAsset* resource(const char path[]) {
+    SkString fullPath = GetResourcePath(path);
+    return SkStream::NewFromFile(fullPath.c_str());
+}
+
+static void codec_yuv(skiatest::Reporter* reporter,
+                  const char path[],
+                  SkISize expectedSizes[3]) {
+    SkAutoTDelete<SkStream> stream(resource(path));
+    if (!stream) {
+        SkDebugf("Missing resource '%s'\n", path);
+        return;
+    }
+    SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream.detach()));
+    REPORTER_ASSERT(reporter, codec);
+    if (!codec) {
+        return;
+    }
+
+    // Test queryYUV8()
+    SkCodec::YUVSizeInfo info;
+    bool success = codec->queryYUV8(nullptr, nullptr);
+    REPORTER_ASSERT(reporter, !success);
+    success = codec->queryYUV8(&info, nullptr);
+    REPORTER_ASSERT(reporter, (expectedSizes == nullptr) == !success);
+    if (!success) {
+        return;
+    }
+    REPORTER_ASSERT(reporter,
+            0 == memcmp((const void*) &info, (const void*) expectedSizes, 3 * sizeof(SkISize)));
+    REPORTER_ASSERT(reporter, info.fYWidthBytes == (uint32_t) SkAlign8(info.fYSize.width()));
+    REPORTER_ASSERT(reporter, info.fUWidthBytes == (uint32_t) SkAlign8(info.fUSize.width()));
+    REPORTER_ASSERT(reporter, info.fVWidthBytes == (uint32_t) SkAlign8(info.fVSize.width()));
+    SkYUVColorSpace colorSpace;
+    success = codec->queryYUV8(&info, &colorSpace);
+    REPORTER_ASSERT(reporter,
+            0 == memcmp((const void*) &info, (const void*) expectedSizes, 3 * sizeof(SkISize)));
+    REPORTER_ASSERT(reporter, info.fYWidthBytes == (uint32_t) SkAlign8(info.fYSize.width()));
+    REPORTER_ASSERT(reporter, info.fUWidthBytes == (uint32_t) SkAlign8(info.fUSize.width()));
+    REPORTER_ASSERT(reporter, info.fVWidthBytes == (uint32_t) SkAlign8(info.fVSize.width()));
+    REPORTER_ASSERT(reporter, kJPEG_SkYUVColorSpace == colorSpace);
+
+    // Allocate the memory for the YUV decode
+    size_t totalBytes = info.fYWidthBytes * info.fYSize.height() +
+            info.fUWidthBytes * info.fUSize.height() +
+            info.fVWidthBytes * info.fVSize.height();
+    SkAutoMalloc storage(totalBytes);
+    void* planes[3];
+    planes[0] = storage.get();
+    planes[1] = SkTAddOffset<void>(planes[0], info.fYWidthBytes * info.fYSize.height());
+    planes[2] = SkTAddOffset<void>(planes[1], info.fUWidthBytes * info.fUSize.height());
+
+    // Test getYUV8Planes()
+    REPORTER_ASSERT(reporter, SkCodec::kInvalidInput ==
+            codec->getYUV8Planes(info, nullptr));
+    REPORTER_ASSERT(reporter, SkCodec::kSuccess ==
+            codec->getYUV8Planes(info, planes));
+}
+
+DEF_TEST(Jpeg_YUV_Codec, r) {
+    SkISize sizes[3];
+
+    sizes[0].set(128, 128);
+    sizes[1].set(64, 64);
+    sizes[2].set(64, 64);
+    codec_yuv(r, "color_wheel.jpg", sizes);
+
+    // H2V2
+    sizes[0].set(512, 512);
+    sizes[1].set(256, 256);
+    sizes[2].set(256, 256);
+    codec_yuv(r, "mandrill_512_q075.jpg", sizes);
+
+    // H1V1
+    sizes[1].set(512, 512);
+    sizes[2].set(512, 512);
+    codec_yuv(r, "mandrill_h1v1.jpg", sizes);
+
+    // H2V1
+    sizes[1].set(256, 512);
+    sizes[2].set(256, 512);
+    codec_yuv(r, "mandrill_h2v1.jpg", sizes);
+
+    // Non-power of two dimensions
+    sizes[0].set(439, 154);
+    sizes[1].set(220, 77);
+    sizes[2].set(220, 77);
+    codec_yuv(r, "cropped_mandrill.jpg", sizes);
+
+    sizes[0].set(8, 8);
+    sizes[1].set(4, 4);
+    sizes[2].set(4, 4);
+    codec_yuv(r, "randPixels.jpg", sizes);
+
+    // Progressive images
+    sizes[0].set(512, 512);
+    sizes[1].set(512, 512);
+    sizes[2].set(512, 512);
+    codec_yuv(r, "brickwork-texture.jpg", sizes);
+    codec_yuv(r, "brickwork_normal-map.jpg", sizes);
+
+    // A CMYK encoded image should fail.
+    codec_yuv(r, "CMYK.jpg", nullptr);
+    // A grayscale encoded image should fail.
+    codec_yuv(r, "grayscale.jpg", nullptr);
+    // A PNG should fail.
+    codec_yuv(r, "arrow.png", nullptr);
+}