Use SkPngEncoder and SkWebpEncoder in WebKit platform

third_party/WebKit/Source/platform/graphics/LoggingCanvas.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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/graphics/LoggingCanvas.h"
 
 #include "platform/geometry/IntSize.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/skia/ImagePixelLocker.h"
 #include "platform/graphics/skia/SkiaUtils.h"
-#include "platform/image-encoders/PNGImageEncoder.h"
+#include "platform/image-encoders/ImageEncoder.h"
 #include "platform/wtf/HexNumber.h"
 #include "platform/wtf/text/Base64.h"
 #include "platform/wtf/text/TextEncoding.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkRect.h"
 
@@ skipping 211 matching lines @@
       return "ARGB8888";
     default:
       NOTREACHED();
       return "?";
   };
 }
 
 std::unique_ptr<JSONObject> ObjectForBitmapData(const SkBitmap& bitmap) {
   Vector<unsigned char> output;
 
-  if (sk_sp<SkImage> image = SkImage::MakeFromBitmap(bitmap)) {
-    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()));
+  SkPixmap src;
+  bool peekResult = bitmap.peekPixels(&src);
+  DCHECK(peekResult);
 
-    PNGImageEncoder::Encode(image_data, &output);
+  SkPngEncoder::Options options;
+  options.fFilterFlags = SkPngEncoder::FilterFlag::kSub;
+  options.fZLibLevel = 3;
+  options.fUnpremulBehavior = SkTransferFunctionBehavior::kIgnore;
+  if (!ImageEncoder::Encode(&output, src, options)) {
+    return nullptr;
   }
 
   std::unique_ptr<JSONObject> data_item = JSONObject::Create();
   data_item->SetString(
       "base64",
       WTF::Base64Encode(reinterpret_cast<char*>(output.data()), output.size()));
   data_item->SetString("mimeType", "image/png");
   return data_item;
 }
 
@@ skipping 627 matching lines @@
   record_as_json->SetArray("operations", canvas.Log());
   return record_as_json->ToPrettyJSONString();
 }
 
 void ShowPaintRecord(const PaintRecord* record) {
   WTFLogAlways("%s\n", RecordAsDebugString(record).Utf8().data());
 }
 #endif
 
 }  // namespace blink