SkPixelSerializer: remove deprecated virtual

Review URL: https://codereview.chromium.org/1512333002

2 files changed, 15 insertions, 6 deletions

diff --git a/tools/sk_tool_utils.cpp b/tools/sk_tool_utils.cpp
index e2bc0fc42c..8c3097602c 100644
--- a/tools/sk_tool_utils.cpp
+++ b/tools/sk_tool_utils.cpp
@@ -222,6 +222,19 @@ SkBitmap create_string_bitmap(int w, int h, SkColor c, int x, int y,
     return bitmap;
 }
 
+bool PngPixelSerializer::onUseEncodedData(const void*, size_t) { return true; }
+SkData* PngPixelSerializer::onEncode(const SkPixmap& pixmap) {
+    SkBitmap bm;
+    if (!bm.installPixels(pixmap.info(),
+                          const_cast<void*>(pixmap.addr()),
+                          pixmap.rowBytes(),
+                          pixmap.ctable(),
+                          nullptr, nullptr)) {
+        return nullptr;
+    }
+    return SkImageEncoder::EncodeData(bm, SkImageEncoder::kPNG_Type, 100);
+}
+
 void add_to_text_blob(SkTextBlobBuilder* builder, const char* text, const SkPaint& origPaint,
                       SkScalar x, SkScalar y) {
     SkPaint paint(origPaint);
diff --git a/tools/sk_tool_utils.h b/tools/sk_tool_utils.h
index 67fd869a87..3eabcdcd0f 100644
--- a/tools/sk_tool_utils.h
+++ b/tools/sk_tool_utils.h
@@ -118,12 +118,8 @@ namespace sk_tool_utils {
     // used.
     class PngPixelSerializer : public SkPixelSerializer {
     public:
-        bool onUseEncodedData(const void*, size_t) override { return true; }
-        SkData* onEncodePixels(const SkImageInfo& info, const void* pixels,
-                               size_t rowBytes) override {
-            return SkImageEncoder::EncodeData(info, pixels, rowBytes,
-                                              SkImageEncoder::kPNG_Type, 100);
-        }
+        bool onUseEncodedData(const void*, size_t) override;
+        SkData* onEncode(const SkPixmap&) override;
     };
 
     // A helper for inserting a drawtext call into a SkTextBlobBuilder