add helpers for using SkData with picture serialization

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
 
@@ skipping 57 matching lines @@
 #endif
 
     /**
      *  Recreate a picture that was serialized into a stream.
      *
      *  Any serialized images in the stream will be passed the image-deserializer, or if that is
      *  null, to the default deserializer that will call SkImage::MakeFromEncoded().
      */
     static sk_sp<SkPicture> MakeFromStream(SkStream*, SkImageDeserializer*);
     static sk_sp<SkPicture> MakeFromStream(SkStream*);
+    static sk_sp<SkPicture> MakeFromData(const void* data, size_t size,
+                                         SkImageDeserializer* = nullptr);
+    static sk_sp<SkPicture> MakeFromData(const SkData* data, SkImageDeserializer* = nullptr);
 
     /**
      *  Recreate a picture that was serialized into a buffer. If the creation requires bitmap
      *  decoding, the decoder must be set on the SkReadBuffer parameter by calling
      *  SkReadBuffer::setBitmapDecoder() before calling SkPicture::CreateFromBuffer().
      *  @param SkReadBuffer Serialized picture data.
      *  @return A new SkPicture representing the serialized data, or NULL if the buffer is
      *          invalid.
      */
     static sk_sp<SkPicture> MakeFromBuffer(SkReadBuffer&);
@@ skipping 26 matching lines @@
 
     /** Return a cull rect for this picture.
         Ops recorded into this picture that attempt to draw outside the cull might not be drawn.
      */
     virtual SkRect cullRect() const = 0;
 
     /** Returns a non-zero value unique among all pictures. */
     uint32_t uniqueID() const;
 
     /**
-     *  Serialize to a stream. If non NULL, serializer will be used to serialize
-     *  bitmaps and images in the picture.
+     *  Serialize the picture to SkData. If non nullptr, pixel-serializer will be used to
+     *  customize how images reference by the picture are serialized/compressed.
      */
-    void serialize(SkWStream*, SkPixelSerializer* = NULL) const;
+    sk_sp<SkData> serialize(SkPixelSerializer* = nullptr) const;
+
+    /**
+     *  Serialize to a stream. If non nullptr, pixel-serializer will be used to
+     *  customize how images reference by the picture are serialized/compressed.
+     */
+    void serialize(SkWStream*, SkPixelSerializer* = nullptr) const;
 
     /**
      *  Serialize to a buffer.
      */
     void flatten(SkWriteBuffer&) const;
 
     /**
      * Returns true if any bitmaps may be produced when this SkPicture
      * is replayed.
      */
@@ skipping 98 matching lines @@
                                         const SkPictureData*,
                                         const SkReadBuffer* buffer);
 
     SkPictInfo createHeader() const;
     SkPictureData* backport() const;
 
     mutable uint32_t fUniqueID;
 };
 
 #endif