Consolidate SkCodec functions for handling rewind

src/codec/SkBmpCodec.h

Index: src/codec/SkBmpCodec.h
diff --git a/src/codec/SkBmpCodec.h b/src/codec/SkBmpCodec.h
index 51d03000919977549919543605daeba40d713e5e..71006f73153ea3028529b0c51daa999b498bc86e 100644
--- a/src/codec/SkBmpCodec.h
+++ b/src/codec/SkBmpCodec.h
@@ -63,10 +63,18 @@ protected:
      */
     static bool ReadHeader(SkStream*, bool inIco, SkCodec** codecOut);
 
+    bool onRewind() override;
+
     /*
-     * Rewinds the image stream if necessary
+     * Returns whether this BMP is part of an ICO image.
      */
-    bool handleRewind(bool inIco);
+    bool inIco() const {

[scroggo_chromium, 2015/08/11 16:29:42]

This split follows the convention we follow for public functions:

public:

function() {
  return this->onVirtualFunction();
}

protected:

virtual onVirtualFunction();

Maybe this isn't necessary here, since inIco() does not need to be made public?

[msarett, 2015/08/12 13:38:46]

I don't feel strongly on this.  Looks fine to me.

+        return this->onInIco();
+    }
+
+    virtual bool onInIco() const {
+        return false;
+    }
 
     /*
      * Get the destination row to start filling from