Merge SkCodec with SkScanlineDecoder

src/codec/SkBmpMaskCodec.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 "SkBmpMaskCodec.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
 
 /*
  * Creates an instance of the decoder
  */
 SkBmpMaskCodec::SkBmpMaskCodec(const SkImageInfo& info, SkStream* stream,
                                uint16_t bitsPerPixel, SkMasks* masks,
-                               SkScanlineDecoder::SkScanlineOrder rowOrder)
+                               SkCodec::SkScanlineOrder rowOrder)
     : INHERITED(info, stream, bitsPerPixel, rowOrder)
     , fMasks(masks)
     , fMaskSwizzler(nullptr)
     , fSrcRowBytes(SkAlign4(compute_row_bytes(this->getInfo().width(), this->bitsPerPixel())))
     , fSrcBuffer(new uint8_t [fSrcRowBytes])
 {}
 
 /*
  * Initiates the bitmap decode
  */
@@ skipping 73 matching lines @@
 
         // Decode the row in destination format
         uint32_t row = this->getDstRow(y, height);
         void* dstRow = SkTAddOffset<void>(dst, row * dstRowBytes);
         fMaskSwizzler->swizzle(dstRow, srcRow);
     }
 
     // Finished decoding the entire image
     return kSuccess;
 }