add helpers for using SkData with picture serialization

src/core/SkPicture.cpp

 /*
  * 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.
  */
 
 #include "SkAtomics.h"
 #include "SkImageDeserializer.h"
 #include "SkImageGenerator.h"
@@ skipping 158 matching lines @@
 
 sk_sp<SkPicture> SkPicture::MakeFromStream(SkStream* stream, SkImageDeserializer* factory) {
     return MakeFromStream(stream, factory, nullptr);
 }
 
 sk_sp<SkPicture> SkPicture::MakeFromStream(SkStream* stream) {
     SkImageDeserializer factory;
     return MakeFromStream(stream, &factory);
 }
 
+sk_sp<SkPicture> SkPicture::MakeFromData(const void* data, size_t size,
+                                         SkImageDeserializer* factory) {
+    SkMemoryStream stream(data, size);
+    return MakeFromStream(&stream, factory, nullptr);
+}
+
+sk_sp<SkPicture> SkPicture::MakeFromData(const SkData* data, SkImageDeserializer* factory) {
+    if (!data) {
+        return nullptr;
+    }
+    SkMemoryStream stream(data->data(), data->size());
+    return MakeFromStream(&stream, factory, nullptr);
+}
+
 sk_sp<SkPicture> SkPicture::MakeFromStream(SkStream* stream, SkImageDeserializer* factory,
                                            SkTypefacePlayback* typefaces) {
     SkPictInfo info;
     if (!InternalOnly_StreamIsSKP(stream, &info) || !stream->readBool()) {
         return nullptr;
     }
     SkAutoTDelete<SkPictureData> data(
             SkPictureData::CreateFromStream(stream, info, factory, typefaces));
     return Forwardport(info, data, nullptr);
 }
@@ skipping 13 matching lines @@
     rec.beginRecording();
         this->playback(&rec);
     rec.endRecording();
     return new SkPictureData(rec, info);
 }
 
 void SkPicture::serialize(SkWStream* stream, SkPixelSerializer* pixelSerializer) const {
     this->serialize(stream, pixelSerializer, nullptr);
 }
 
+sk_sp<SkData> SkPicture::serialize(SkPixelSerializer* pixelSerializer) const {
+    SkDynamicMemoryWStream stream;
+    this->serialize(&stream, pixelSerializer, nullptr);
+    return stream.detachAsData();
+}
+
 void SkPicture::serialize(SkWStream* stream,
                           SkPixelSerializer* pixelSerializer,
                           SkRefCntSet* typefaceSet) const {
     SkPictInfo info = this->createHeader();
     SkAutoTDelete<SkPictureData> data(this->backport());
 
     stream->write(&info, sizeof(info));
     if (data) {
         stream->writeBool(true);
         data->serialize(stream, pixelSerializer, typefaceSet);
@@ skipping 29 matching lines @@
 #endif
 
 // Global setting to disable security precautions for serialization.
 void SkPicture::SetPictureIOSecurityPrecautionsEnabled_Dangerous(bool set) {
     g_AllPictureIOSecurityPrecautionsEnabled = set;
 }
 
 bool SkPicture::PictureIOSecurityPrecautionsEnabled() {
     return g_AllPictureIOSecurityPrecautionsEnabled;
 }