Remove SK_SUPPORT_LEGACY_DATA_FACTORIES.

blimp/engine/renderer/engine_image_serialization_processor.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "blimp/engine/renderer/engine_image_serialization_processor.h"
 
 #include <stddef.h>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 11 matching lines @@
 #include "third_party/libwebp/webp/encode.h"
 #include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkPixelSerializer.h"
 #include "third_party/skia/include/core/SkUnPreMultiply.h"
 
 namespace blimp {
 namespace engine {
 namespace {
 
-SkData* BlobCacheImageMetadataProtoAsSkData(
+sk_sp<SkData> BlobCacheImageMetadataProtoAsSkData(
     const BlobCacheImageMetadata& proto) {
   int signed_size = proto.ByteSize();
   size_t unsigned_size = base::checked_cast<size_t>(signed_size);
   std::vector<uint8_t> serialized(unsigned_size);
   proto.SerializeWithCachedSizesToArray(serialized.data());
-  return SkData::NewWithCopy(serialized.data(), serialized.size());
+  return SkData::MakeWithCopy(serialized.data(), serialized.size());
 }
 
 // For each pixel, un-premultiplies the alpha-channel for each of the RGB
 // channels. As an example, for a channel value that before multiplication was
 // 255, and after applying an alpha of 128, the premultiplied pixel would be
 // 128. The un-premultiply step uses the alpha-channel to get back to 255. The
 // alpha channel is kept unchanged.
 void UnPremultiply(const unsigned char* in_pixels,
                    unsigned char* out_pixels,
                    size_t pixel_count) {
@@ skipping 89 matching lines @@
   if (!blob_channel_->IsInClientCache(blob_id)) {
     blob_channel_->DeliverBlob(blob_id);
   }
 
   // Construct a proto with the image metadata.
   BlobCacheImageMetadata proto;
   proto.set_id(blob_id);
   proto.set_width(pixmap.width());
   proto.set_height(pixmap.height());
 
-  SkData* sk_data = BlobCacheImageMetadataProtoAsSkData(proto);
+  sk_sp<SkData> sk_data = BlobCacheImageMetadataProtoAsSkData(proto);
   DVLOG(3) << "Returning image ID " << BlobIdToString(blob_id);
-  return sk_data;
+  return sk_data.release();
 }
 
 scoped_refptr<BlobData> EngineImageSerializationProcessor::EncodeImageAsBlob(
     const SkPixmap& pixmap) {
   DVLOG(2) << "Encoding image color_type=" << pixmap.colorType()
            << ", alpha_type=" << pixmap.alphaType() << " " << pixmap.width()
            << "x" << pixmap.height();
 
   WebPConfig config;
   CHECK(WebPConfigInit(&config));
@@ skipping 40 matching lines @@
   }
 
   scoped_refptr<BlobData> blob_data(new BlobData);
   blob_data->data.assign(reinterpret_cast<const char*>(writer_state_.mem),
                          writer_state_.size);
   return blob_data;
 }
 
 }  // namespace engine
 }  // namespace blimp