Change SkDecodingImageGenerator to hide implementation details.

src/images/SkDecodingImageGenerator.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkDecodingImageGenerator_DEFINED
 #define SkDecodingImageGenerator_DEFINED
 
 #include "SkBitmap.h"
 #include "SkImageGenerator.h"
 
 class SkData;
 class SkStreamRewindable;
 
 /**
  *  An implementation of SkImageGenerator that calls into
  *  SkImageDecoder.
  */
-class SkDecodingImageGenerator : public SkImageGenerator {
-public:
-    virtual ~SkDecodingImageGenerator();
-    virtual SkData* refEncodedData() SK_OVERRIDE;
-    // This implementaion of getInfo() always returns true.
-    virtual bool getInfo(SkImageInfo* info) SK_OVERRIDE;
-    virtual bool getPixels(const SkImageInfo& info,
-                           void* pixels,
-                           size_t rowBytes) SK_OVERRIDE;
+namespace SkDecodingImageGenerator {

[reed2, 2014/04/04 20:59:51]

Why namespace instead of class? Other examples in skia use class for this (e.g.
SkGradientShader)

     /**
      *  These options will be passed on to the image decoder.  The
      *  defaults are sensible.
      *
      *  @param fSampleSize If set to > 1, tells the decoder to return a
      *         smaller than original bitmap, sampling 1 pixel for
      *         every size pixels. e.g. if sample size is set to 3,
      *         then the returned bitmap will be 1/3 as wide and high,
      *         and will contain 1/9 as many pixels as the original.
      *         Note: this is a hint, and the codec may choose to
@@ skipping 50 matching lines @@
      *    SkImageGenerator* gen
      *        = SkDecodingImageGenerator::Create(
      *            stream->duplicate(), SkDecodingImageGenerator::Options());
      *    ...
      *    SkDELETE(gen);
      *
      *  @param Options (see above)
      *
      *  @return NULL on failure, a new SkImageGenerator on success.
      */
-    static SkImageGenerator* Create(SkStreamRewindable* stream,
-                                    const Options& opt);
+    SkImageGenerator* Create(SkStreamRewindable* stream,
+                             const Options& opt);
 
     /**
      *  @param data Contains the encoded image data that will be used by
      *         the SkDecodingImageGenerator.  Will be ref()ed by the
      *         SkImageGenerator constructor and and unref()ed on deletion.
      */
-    static SkImageGenerator* Create(SkData* data, const Options& opt);
-
-private:
-    SkData*                fData;
-    SkStreamRewindable*    fStream;
-    const SkImageInfo      fInfo;
-    const int              fSampleSize;
-    const bool             fDitherImage;
-
-    SkDecodingImageGenerator(SkData* data,
-                             SkStreamRewindable* stream,
-                             const SkImageInfo& info,
-                             int sampleSize,
-                             bool ditherImage);
-    static SkImageGenerator* Create(SkData*, SkStreamRewindable*,
-                                    const Options&);
-    typedef SkImageGenerator INHERITED;
+    SkImageGenerator* Create(SkData* data, const Options& opt);
 };
 
 //  // Example of most basic use case:
 //
 //  bool install_data(SkData* data, SkBitmap* dst) {
 //     return SkInstallDiscardablePixelRef(
 //         SkDecodingImageGenerator::Create(
 //             data, SkDecodingImageGenerator::Options()), dst, NULL);
 //  }
 //  bool install_stream(SkStreamRewindable* stream, SkBitmap* dst) {
 //     return SkInstallDiscardablePixelRef(
 //         SkDecodingImageGenerator::Create(
 //             stream, SkDecodingImageGenerator::Options()), dst, NULL);
 //  }
 
 #endif  // SkDecodingImageGenerator_DEFINED