Use SkPngEncoder and SkWebpEncoder in WebKit platform

third_party/WebKit/Source/platform/graphics/PictureSnapshot.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 22 matching lines @@
 #include <memory>
 #include "platform/geometry/IntSize.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/LoggingCanvas.h"
 #include "platform/graphics/ProfilingCanvas.h"
 #include "platform/graphics/ReplayingCanvas.h"
 #include "platform/graphics/skia/ImagePixelLocker.h"
 #include "platform/image-decoders/ImageDecoder.h"
 #include "platform/image-decoders/ImageFrame.h"
 #include "platform/image-decoders/SegmentReader.h"
-#include "platform/image-encoders/PNGImageEncoder.h"
+#include "platform/image-encoders/ImageEncoder.h"
 #include "platform/wtf/CurrentTime.h"
 #include "platform/wtf/HexNumber.h"
 #include "platform/wtf/PtrUtil.h"
 #include "platform/wtf/text/Base64.h"
 #include "platform/wtf/text/TextEncoding.h"
 #include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkImageDeserializer.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/core/SkStream.h"
@@ skipping 84 matching lines @@
     SkAutoCanvasRestore auto_restore(&canvas, false);
     canvas.saveLayer(nullptr, nullptr);
 
     canvas.scale(scale, scale);
     canvas.ResetStepCount();
     picture_->playback(&canvas, &canvas);
   }
   std::unique_ptr<Vector<char>> base64_data = WTF::MakeUnique<Vector<char>>();
   Vector<char> encoded_image;
 
-  sk_sp<SkImage> image = SkImage::MakeFromBitmap(bitmap);
-  if (!image)
+  SkPixmap src;
+  bool peekResult = bitmap.peekPixels(&src);
+  DCHECK(peekResult);
+
+  SkPngEncoder::Options options;

[scroggo_chromium, 2017/05/22 13:35:04]

Both LoggingCanvas.cpp and this one use the same values. Should they be the
default? Then this can just be one line.

[msarett1, 2017/05/22 15:33:56]

Arguably kIgnore should be the default - but I'm trying to promote kRespect as
an option.

The other defaults are set to match Android, which I think is fine.

FWIW, I'm not sure that LoggingCanvas or PictureSnapshot really care what these
values are.  I'm just being careful not to introduce behavior changes in this
CL.

+  options.fFilterFlags = SkPngEncoder::FilterFlag::kSub;
+  options.fZLibLevel = 3;
+  options.fUnpremulBehavior = SkTransferFunctionBehavior::kIgnore;
+  if (!ImageEncoder::Encode(
+          reinterpret_cast<Vector<unsigned char>*>(&encoded_image), src,
+          options)) {
     return nullptr;
-
-  ImagePixelLocker pixel_locker(image, kUnpremul_SkAlphaType,
-                                kRGBA_8888_SkColorType);
-  ImageDataBuffer image_data(
-      IntSize(image->width(), image->height()),
-      static_cast<const unsigned char*>(pixel_locker.Pixels()));
-  if (!PNGImageEncoder::Encode(
-          image_data, reinterpret_cast<Vector<unsigned char>*>(&encoded_image)))
-    return nullptr;
+  }
 
   Base64Encode(encoded_image, *base64_data);
   return base64_data;
 }
 
 std::unique_ptr<PictureSnapshot::Timings> PictureSnapshot::Profile(
     unsigned min_repeat_count,
     double min_duration,
     const FloatRect* clip_rect) const {
   std::unique_ptr<PictureSnapshot::Timings> timings =
@@ skipping 27 matching lines @@
 }
 
 std::unique_ptr<JSONArray> PictureSnapshot::SnapshotCommandLog() const {
   const SkIRect bounds = picture_->cullRect().roundOut();
   LoggingCanvas canvas(bounds.width(), bounds.height());
   picture_->playback(&canvas);
   return canvas.Log();
 }
 
 }  // namespace blink