Revert of default SkPixelSerializer

include/core/SkImageEncoder.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkImageEncoder_DEFINED
 #define SkImageEncoder_DEFINED
 
 #include "SkImageInfo.h"
 #include "SkTRegistry.h"
 
 class SkBitmap;
-class SkPixelSerializer;
-class SkPixmap;
 class SkData;
 class SkWStream;
 
 class SkImageEncoder {
 public:
     // TODO (scroggo): Merge with SkEncodedFormat.
     enum Type {
         kUnknown_Type,
         kBMP_Type,
         kGIF_Type,
@@ skipping 32 matching lines @@
      * Encode bitmap 'bm' in the desired format, writing results to
      * stream 'stream', at quality level 'quality' (which can be in
      * range 0-100). Returns false on failure.
      */
     bool encodeStream(SkWStream* stream, const SkBitmap& bm, int quality);
 
     static SkData* EncodeData(const SkImageInfo&, const void* pixels, size_t rowBytes,
                               Type, int quality);
     static SkData* EncodeData(const SkBitmap&, Type, int quality);
 
-    static SkData* EncodeData(const SkPixmap&, Type, int quality);
-
     static bool EncodeFile(const char file[], const SkBitmap&, Type,
                            int quality);
     static bool EncodeStream(SkWStream*, const SkBitmap&, Type,
                            int quality);
 
-    /** Uses SkImageEncoder to serialize images that are not already
-        encoded as SkImageEncoder::kPNG_Type images. */
-    static SkPixelSerializer* CreatePixelSerializer();
-
 protected:
     /**
      * Encode bitmap 'bm' in the desired format, writing results to
      * stream 'stream', at quality level 'quality' (which can be in
      * range 0-100).
      *
      * This must be overridden by each SkImageEncoder implementation.
      */
     virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) = 0;
 };
@@ skipping 21 matching lines @@
 DECLARE_ENCODER_CREATOR(WEBPImageEncoder);
 
 #ifdef SK_BUILD_FOR_IOS
 DECLARE_ENCODER_CREATOR(PNGImageEncoder_IOS);
 #endif
 
 // Typedef to make registering encoder callback easier
 // This has to be defined outside SkImageEncoder. :(
 typedef SkTRegistry<SkImageEncoder*(*)(SkImageEncoder::Type)> SkImageEncoder_EncodeReg;
 #endif