Move all knowledge of X sampling into SkScaledCodec

src/codec/SkCodec_wbmp.cpp

 /*
  * Copyright 2015 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 "SkCodecPriv.h"
 #include "SkColorPriv.h"
 #include "SkColorTable.h"
-#include "SkScaledCodec.h"
 #include "SkStream.h"
 #include "SkCodec_wbmp.h"
 
 // Each bit represents a pixel, so width is actually a number of bits.
 // A row will always be stored in bytes, so we round width up to the
 // nearest multiple of 8 to get the number of bits actually in the row.
 // We then divide by 8 to convert to bytes.
 static inline size_t get_src_row_bytes(int width) {
     return SkAlign8(width) >> 3;
 }
@@ skipping 49 matching lines @@
 }
 
 SkSwizzler* SkWbmpCodec::initializeSwizzler(const SkImageInfo& info,
         const SkPMColor* ctable, const Options& opts) {
     // Create the swizzler based on the desired color type
     switch (info.colorType()) {
         case kIndex_8_SkColorType:
         case kN32_SkColorType:
         case kRGB_565_SkColorType:
         case kGray_8_SkColorType:
-            return SkSwizzler::CreateSwizzler(SkSwizzler::kBit, ctable, info, opts.fZeroInitialized, 
-                                              this->getInfo());
+            break;
         default:
             return nullptr;
     }
+    return SkSwizzler::CreateSwizzler(SkSwizzler::kBit, ctable, info,
+                                      opts.fZeroInitialized);
 }
 
 SkCodec::Result SkWbmpCodec::readRow(uint8_t* row) {
     if (this->stream()->read(row, fSrcRowBytes) != fSrcRowBytes) {
         return kIncompleteInput;
     }
     return kSuccess;
 }
 
 SkWbmpCodec::SkWbmpCodec(const SkImageInfo& info, SkStream* stream)
@@ skipping 10 matching lines @@
 SkCodec::Result SkWbmpCodec::onGetPixels(const SkImageInfo& info,
                                          void* dst,
                                          size_t rowBytes,
                                          const Options& options,
                                          SkPMColor ctable[],
                                          int* ctableCount) {
     if (options.fSubset) {
         // Subsets are not supported.
         return kUnimplemented;
     }
-    if (info.dimensions() != this->getInfo().dimensions()) {
-        return kInvalidScale;
-    }
 
     if (!valid_alpha(info.alphaType(), this->getInfo().alphaType())) {
         return kInvalidConversion;
     }
 
     // Prepare a color table if necessary
     setup_color_table(info.colorType(), ctable, ctableCount);
 
-
     // Initialize the swizzler
     SkAutoTDelete<SkSwizzler> swizzler(this->initializeSwizzler(info, ctable, options));
     if (nullptr == swizzler.get()) {
         return kInvalidConversion;
     }
 
     // Perform the decode
     SkISize size = info.dimensions();
     SkAutoTMalloc<uint8_t> src(fSrcRowBytes);
     void* dstRow = dst;
@@ skipping 35 matching lines @@
     }
     return kSuccess;
 }
 
 SkCodec::Result SkWbmpCodec::onStartScanlineDecode(const SkImageInfo& dstInfo,
         const Options& options, SkPMColor inputColorTable[], int* inputColorCount) {
     if (options.fSubset) {
         // Subsets are not supported.
         return kUnimplemented;
     }
-    if (dstInfo.dimensions() != this->getInfo().dimensions()) {
-        if (!SkScaledCodec::DimensionsSupportedForSampling(this->getInfo(), dstInfo)) {
-                return kInvalidScale;
-        }
-    }
 
     if (!valid_alpha(dstInfo.alphaType(), this->getInfo().alphaType())) {
         return kInvalidConversion;
     }
 
     // Fill in the color table
     setup_color_table(dstInfo.colorType(), inputColorTable, inputColorCount);
 
     // Copy the color table to a pointer that can be owned by the scanline decoder
     if (kIndex_8_SkColorType == dstInfo.colorType()) {
         fColorTable.reset(new SkColorTable(inputColorTable, 2));
     }
 
     // Initialize the swizzler
     fSwizzler.reset(this->initializeSwizzler(dstInfo,
             get_color_ptr(fColorTable.get()), options));
     if (nullptr == fSwizzler.get()) {
         return kInvalidConversion;
     }
 
     fSrcBuffer.reset(fSrcRowBytes);
 
     return kSuccess;
 }