Split SkBmpCodec into three separate classes

Will regress behavior on gold on test32bfv4.bmp, where we
will no longer fix transparent decodes.

TODO: Start fixing transparent decodes again, or decide
that we don't want to fix them and remove isTransparent
from SkSwizzler.  I think this may become more clear when I
start implementing the scanline decoder.

BUG=skia:

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

1 files changed, 4 insertions, 8 deletions

diff --git a/src/codec/SkMaskSwizzler.h b/src/codec/SkMaskSwizzler.h
index 4ccc3ae4a4..9f4dd440aa 100644
--- a/src/codec/SkMaskSwizzler.h
+++ b/src/codec/SkMaskSwizzler.h
@@ -4,6 +4,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#ifndef SkMaskSwizzler_DEFINED
+#define SkMaskSwizzler_DEFINED
 
 #include "SkMasks.h"
 #include "SkSwizzler.h"
@@ -19,37 +21,29 @@ class SkMaskSwizzler {
 public:
 
     /*
-     *
      * Create a new swizzler
      * @param masks Unowned pointer to helper class
-     *
      */
     static SkMaskSwizzler* CreateMaskSwizzler(const SkImageInfo& imageInfo,
                                               SkMasks* masks,
                                               uint32_t bitsPerPixel);
 
     /*
-     *
      * Swizzle a row
-     *
      */
     SkSwizzler::ResultAlpha swizzle(void* dst, const uint8_t* SK_RESTRICT src);
 
 private:
 
     /*
-     *
      * Row procedure used for swizzle
-     *
      */
     typedef SkSwizzler::ResultAlpha (*RowProc)(
             void* dstRow, const uint8_t* srcRow, int width,
             SkMasks* masks);
 
     /*
-     *
      * Constructor for mask swizzler
-     *
      */
     SkMaskSwizzler(const SkImageInfo& info, SkMasks* masks, RowProc proc);
 
@@ -58,3 +52,5 @@ private:
     SkMasks*           fMasks;       // unowned
     const RowProc      fRowProc;
 };
+
+#endif