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
@@ skipping 17 matching lines @@
 class SkWStream;
 
 struct SkPictInfo;
 
 class SkRecord;
 
 namespace SkRecords {
     class CollectLayers;
 };
 
+//#define SK_LEGACY_ENCODE_BITMAP
+
+#ifdef SK_LEGACY_ENCODE_BITMAP
+#include "SkPixelSerializer.h"
+#else
+class SkPixelSerializer;
+#endif
+
 /** \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 89 matching lines @@
      *  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().
      */
     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.
      */
-    void serialize(SkWStream*, EncodeBitmap encoder = NULL) const;
+    void serialize(SkWStream* wStream, EncodeBitmap encoder) const {
+        EncodeBitmapSerializer serializer(encoder);
+        this->serialize(wStream, &serializer);
+    }
+#endif
+
+    void serialize(SkWStream*, SkPixelSerializer* serializer = NULL) const;
 
     /**
      *  Serialize to a buffer.
      */
     void flatten(SkWriteBuffer&) const;
 
     /**
      * Returns true if any bitmaps may be produced when this SkPicture
      * is replayed.
      */
@@ skipping 125 matching lines @@
 
         bool        fWillPlaybackBitmaps;
         bool        fHasText;
         int         fNumPaintWithPathEffectUses;
         int         fNumFastPathDashEffects;
         int         fNumAAConcavePaths;
         int         fNumAAHairlineConcavePaths;
         int         fNumAADFEligibleConcavePaths;
     } fAnalysis;
 
+#ifdef SK_LEGACY_ENCODE_BITMAP
+    // Helper to use the new API.
+    class EncodeBitmapSerializer : public SkPixelSerializer {
+    public:
+        explicit EncodeBitmapSerializer(EncodeBitmap encoder)
+            : fEncoder(encoder)
+        {
+            SkASSERT(fEncoder);
+        }
+
+        bool useEncodedData(SkData*) SK_OVERRIDE { return true; }
+
+        SkData* encodePixels(const SkImageInfo& info, void* pixels, size_t rowBytes) SK_OVERRIDE {
+            size_t unused;
+            SkBitmap bm;
+            bm.installPixels(info, pixels, rowBytes);
+            return fEncoder(&unused, bm);
+        }
+
+    private:
+        EncodeBitmap fEncoder;
+    };
+#endif
+
     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