Revert of Replace EncodeBitmap with an interface.

include/core/SkPicture.h

 
 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPicture_DEFINED
 #define SkPicture_DEFINED
 
 #include "SkBitmap.h"
 #include "SkDrawPictureCallback.h"
 #include "SkImageDecoder.h"
 #include "SkRefCnt.h"
 #include "SkTDArray.h"
 
 #if SK_SUPPORT_GPU
 class GrContext;
 #endif
 
 class SkBBoxHierarchy;
 class SkCanvas;
 class SkData;
 class SkPictureData;
-class SkPixelSerializer;
 class SkStream;
 class SkWStream;
 
 struct SkPictInfo;
 
 class SkRecord;
 
 namespace SkRecords {
     class CollectLayers;
 };
 
-//#define SK_LEGACY_ENCODE_BITMAP
-
 /** \class SkPicture
 
     The SkPicture class records the drawing commands made to a canvas, to
     be played back at a later time.
 */
 class SK_API SkPicture : public SkNVRefCnt<SkPicture> {
 public:
     // AccelData provides a base class for device-specific acceleration
     // data. It is added to the picture via EXPERIMENTAL_addAccelData.
     class AccelData : public SkRefCnt {
@@ skipping 86 matching lines @@
 
     /**
      *  Function to encode an SkBitmap to an SkData. A function with this
      *  signature can be passed to serialize() and SkWriteBuffer.
      *  Returning NULL will tell the SkWriteBuffer to use
      *  SkBitmap::flatten() to store the bitmap.
      *
      *  @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.
      */
     void flatten(SkWriteBuffer&) const;
 
     /**
      * Returns true if any bitmaps may be produced when this SkPicture
      * is replayed.
      */
@@ skipping 134 matching lines @@
 
     friend class SkPictureRecorder;            // SkRecord-based constructor.
     friend class GrLayerHoister;               // access to fRecord
     friend class ReplaceDraw;
     friend class SkPictureUtils;
     friend class SkRecordedDrawable;
 };
 SK_COMPILE_ASSERT(sizeof(SkPicture) <= 96, SkPictureSize);
 
 #endif