Delete dead SkImageDecoder::buildTileIndex and decodeSubset code

src/images/SkImageDecoder_libwebp.cpp

 /*
  * Copyright 2010, The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ skipping 85 matching lines @@
         fOrigWidth = 0;
         fOrigHeight = 0;
         fHasAlpha = 0;
     }
 
     Format getFormat() const override {
         return kWEBP_Format;
     }
 
 protected:
-    bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) override;
-    bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) override;
     Result onDecode(SkStream* stream, SkBitmap* bm, Mode) override;
 
 private:
     /**
      *  Called when determining the output config to request to webp.
      *  If the image does not have alpha, there is no need to premultiply.
      *  If the caller wants unpremultiplied colors, that is respected.
      */
     bool shouldPremultiply() const {
         return SkToBool(fHasAlpha) && !this->getRequireUnpremultipliedColors();
@@ skipping 35 matching lines @@
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // This guy exists just to aid in debugging, as it allows debuggers to just
 // set a break-point in one place to see all error exists.
 static void print_webp_error(const SkBitmap& bm, const char msg[]) {
     SkDEBUGF(("libwebp error %s [%d %d]", msg, bm.width(), bm.height()));
 }
 
-static bool return_false(const SkBitmap& bm, const char msg[]) {
-    print_webp_error(bm, msg);
-    return false; // must always return false
-}
-
 static SkImageDecoder::Result return_failure(const SkBitmap& bm, const char msg[]) {
     print_webp_error(bm, msg);
     return SkImageDecoder::kFailure; // must always return kFailure
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static WEBP_CSP_MODE webp_decode_mode(const SkBitmap* decodedBitmap, bool premultiply) {
     WEBP_CSP_MODE mode = MODE_LAST;
     const SkColorType ct = decodedBitmap->colorType();
@@ skipping 80 matching lines @@
 
     if (width != decodedBitmap->width() || height != decodedBitmap->height()) {
         config->options.use_scaling = 1;
         config->options.scaled_width = decodedBitmap->width();
         config->options.scaled_height = decodedBitmap->height();
     }
 
     return true;
 }
 
-static bool webp_get_config_resize_crop(WebPDecoderConfig* config,
-                                        SkBitmap* decodedBitmap,
-                                        const SkIRect& region, bool premultiply) {
-
-    if (!webp_get_config_resize(config, decodedBitmap, region.width(),
-                                region.height(), premultiply)) {
-      return false;
-    }
-
-    config->options.use_cropping = 1;
-    config->options.crop_left = region.fLeft;
-    config->options.crop_top = region.fTop;
-    config->options.crop_width = region.width();
-    config->options.crop_height = region.height();
-
-    return true;
-}
-
 bool SkWEBPImageDecoder::setDecodeConfig(SkBitmap* decodedBitmap, int width, int height) {
     SkColorType colorType = this->getPrefColorType(k32Bit_SrcDepth, SkToBool(fHasAlpha));
 
     // YUV converter supports output in RGB565, RGBA4444 and RGBA8888 formats.
     if (fHasAlpha) {
         if (colorType != kARGB_4444_SkColorType) {
             colorType = kN32_SkColorType;
         }
     } else {
         if (colorType != kRGB_565_SkColorType && colorType != kARGB_4444_SkColorType) {
             colorType = kN32_SkColorType;
         }
     }
 
     SkAlphaType alphaType = kOpaque_SkAlphaType;
     if (SkToBool(fHasAlpha)) {
         if (this->getRequireUnpremultipliedColors()) {
             alphaType = kUnpremul_SkAlphaType;
         } else {
             alphaType = kPremul_SkAlphaType;
         }
     }
     return decodedBitmap->setInfo(SkImageInfo::Make(width, height, colorType, alphaType));
 }
 
-bool SkWEBPImageDecoder::onBuildTileIndex(SkStreamRewindable* stream,
-                                          int *width, int *height) {
-    SkAutoTDelete<SkStreamRewindable> streamDeleter(stream);
-    int origWidth, origHeight, hasAlpha;
-    if (!webp_parse_header(stream, &origWidth, &origHeight, &hasAlpha)) {
-        return false;
-    }
-
-    if (!stream->rewind()) {
-        SkDebugf("Failed to rewind webp stream!");
-        return false;
-    }
-
-    *width = origWidth;
-    *height = origHeight;
-
-    this->fInputStream.reset(streamDeleter.detach());
-    this->fOrigWidth = origWidth;
-    this->fOrigHeight = origHeight;
-    this->fHasAlpha = hasAlpha;
-
-    return true;
-}
-
-static bool is_config_compatible(const SkBitmap& bitmap) {
-    const SkColorType ct = bitmap.colorType();
-    return ct == kARGB_4444_SkColorType || ct == kRGB_565_SkColorType || ct == kN32_SkColorType;
-}
-
-bool SkWEBPImageDecoder::onDecodeSubset(SkBitmap* decodedBitmap,
-                                        const SkIRect& region) {
-    SkIRect rect = SkIRect::MakeWH(fOrigWidth, fOrigHeight);
-
-    if (!rect.intersect(region)) {
-        // If the requested region is entirely outsides the image, return false
-        return false;
-    }
-
-    const int sampleSize = this->getSampleSize();
-    SkScaledBitmapSampler sampler(rect.width(), rect.height(), sampleSize);
-    const int width = sampler.scaledWidth();
-    const int height = sampler.scaledHeight();
-
-    // The image can be decoded directly to decodedBitmap if
-    //   1. the region is within the image range
-    //   2. bitmap's config is compatible
-    //   3. bitmap's size is same as the required region (after sampled)
-    bool directDecode = (rect == region) &&
-                        (decodedBitmap->isNull() ||
-                         (is_config_compatible(*decodedBitmap) &&
-                         (decodedBitmap->width() == width) &&
-                         (decodedBitmap->height() == height)));
-
-    SkBitmap tmpBitmap;
-    SkBitmap *bitmap = decodedBitmap;
-
-    if (!directDecode) {
-        bitmap = &tmpBitmap;
-    }
-
-    if (bitmap->isNull()) {
-        if (!setDecodeConfig(bitmap, width, height)) {
-            return false;
-        }
-        // alloc from native heap if it is a temp bitmap. (prevent GC)
-        bool allocResult = (bitmap == decodedBitmap)
-                               ? allocPixelRef(bitmap, nullptr)
-                               : bitmap->tryAllocPixels();
-        if (!allocResult) {
-            return return_false(*decodedBitmap, "allocPixelRef");
-        }
-    }
-
-    SkAutoLockPixels alp(*bitmap);
-    WebPDecoderConfig config;
-    if (!webp_get_config_resize_crop(&config, bitmap, rect,
-                                     this->shouldPremultiply())) {
-        return false;
-    }
-
-    // Decode the WebP image data stream using WebP incremental decoding for
-    // the specified cropped image-region.
-    if (!webp_idecode(this->fInputStream, &config)) {
-        return false;
-    }
-
-    if (!directDecode) {
-        return cropBitmap(decodedBitmap, bitmap, sampleSize, region.x(), region.y(),
-                          region.width(), region.height(), rect.x(), rect.y());
-    }
-    return true;
-}
-
 SkImageDecoder::Result SkWEBPImageDecoder::onDecode(SkStream* stream, SkBitmap* decodedBitmap,
                                                     Mode mode) {
 #ifdef TIME_DECODE
     AutoTimeMillis atm("WEBP Decode");
 #endif
 
     int origWidth, origHeight, hasAlpha;
     if (!webp_parse_header(stream, &origWidth, &origHeight, &hasAlpha)) {
         return kFailure;
     }
@@ skipping 254 matching lines @@
     return SkImageDecoder::kUnknown_Format;
 }
 
 static SkImageEncoder* sk_libwebp_efactory(SkImageEncoder::Type t) {
     return (SkImageEncoder::kWEBP_Type == t) ? new SkWEBPImageEncoder : nullptr;
 }
 
 static SkImageDecoder_DecodeReg gDReg(sk_libwebp_dfactory);
 static SkImageDecoder_FormatReg gFormatReg(get_format_webp);
 static SkImageEncoder_EncodeReg gEReg(sk_libwebp_efactory);