Revert of Replace EncodeBitmap with an interface.

include/core/SkPicture.h

Index: include/core/SkPicture.h
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index 88d8b05a4bc6c7e816c0c1c8f447e16b1328242f..f764d346cc4b9e8f4b828809372cd8305516265c 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -24,7 +24,6 @@
 class SkCanvas;
 class SkData;
 class SkPictureData;
-class SkPixelSerializer;
 class SkStream;
 class SkWStream;
 
@@ -35,8 +34,6 @@
 namespace SkRecords {
     class CollectLayers;
 };
-
-//#define SK_LEGACY_ENCODE_BITMAP
 
 /** \class SkPicture
 
@@ -144,30 +141,15 @@
      *  @param pixelRefOffset DEPRECATED -- caller assumes it will return 0.
      *  @return SkData If non-NULL, holds encoded data representing the passed
      *      in bitmap. The caller is responsible for calling unref().
-     *
-     *  TODO: No longer used by SkPicture (except when SK_LEGACY_ENCODE_BITMAP
-     *  is defined. Still used by PDF though. Move into PDF.
      */
     typedef SkData* (*EncodeBitmap)(size_t* pixelRefOffset, const SkBitmap& bm);
 
-#ifdef SK_LEGACY_ENCODE_BITMAP
     /**
      *  Serialize to a stream. If non NULL, encoder will be used to encode
      *  any bitmaps in the picture.
      *  encoder will never be called with a NULL pixelRefOffset.
-     *  DEPRECATED - use serialize(SkWStream*, SkPixelSerializer* serializer)
-     *  instead.
-     */
-    void serialize(SkWStream* wStream, EncodeBitmap encoder) const;
-#endif
-
-    /**
-     *  Serialize to a stream. If non NULL, serializer will be used to serialize
-     *  any bitmaps in the picture.
-     *
-     *  TODO: Use serializer to serialize SkImages as well.
-     */
-    void serialize(SkWStream*, SkPixelSerializer* serializer = NULL) const;
+     */
+    void serialize(SkWStream*, EncodeBitmap encoder = NULL) const;
 
     /**
      *  Serialize to a buffer.