SkCodec: add wbmp class

src/codec/SkCodec.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 "SkData.h"
 #include "SkCodec_libbmp.h"
 #include "SkCodec_libico.h"
 #include "SkCodec_libpng.h"
+#include "SkCodec_wbmp.h"
 #include "SkStream.h"
 
 struct DecoderProc {
     bool (*IsFormat)(SkStream*);
     SkCodec* (*NewFromStream)(SkStream*);
 };
 
 static const DecoderProc gDecoderProcs[] = {
     { SkPngCodec::IsPng, SkPngCodec::NewFromStream },
     { SkIcoCodec::IsIco, SkIcoCodec::NewFromStream },
-    { SkBmpCodec::IsBmp, SkBmpCodec::NewFromStream }
+    { SkBmpCodec::IsBmp, SkBmpCodec::NewFromStream },
+    { SkWbmpCodec::IsWbmp, SkWbmpCodec::NewFromStream }
 };
 
 SkCodec* SkCodec::NewFromStream(SkStream* stream) {
     if (!stream) {
         return NULL;
     }
     for (uint32_t i = 0; i < SK_ARRAY_COUNT(gDecoderProcs); i++) {
         DecoderProc proc = gDecoderProcs[i];
         const bool correctFormat = proc.IsFormat(stream);
         if (!stream->rewind()) {
@@ skipping 15 matching lines @@
 
 SkCodec::SkCodec(const SkImageInfo& info, SkStream* stream)
     : INHERITED(info)
 #ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
     , fInfo(info)
 #endif
     , fStream(stream)
     , fNeedsRewind(false)
 {}
 
-bool SkCodec::rewindIfNeeded() {
+SkCodec::RewindState SkCodec::rewindIfNeeded() {
     // Store the value of fNeedsRewind so we can update it. Next read will
     // require a rewind.
-    const bool neededRewind = fNeedsRewind;
+    const bool noRewind = !fNeedsRewind;
     fNeedsRewind = true;
-    return !neededRewind || fStream->rewind();
+    return noRewind ? kNoRewindNecessary_RewindState

[scroggo, 2015/03/26 20:29:44]

nit: I find this double tertiary statement harder to follow than just

if (noRewind) {
  return kNoRewindNece;
}

// other conditions, tertiary or otherwise.

[hal.canary, 2015/03/26 21:46:09]

Done.

+                    : fStream->rewind() ? kRewound_RewindState
+                                        : kCouldNotRewind_RewindState;
 }
 
 SkScanlineDecoder* SkCodec::getScanlineDecoder(const SkImageInfo& dstInfo) {
     fScanlineDecoder.reset(NULL);
     if (!rewindIfNeeded()) {
         return NULL;
     }
     fScanlineDecoder.reset(this->onGetScanlineDecoder(dstInfo));
     return fScanlineDecoder.get();
 }