From db6830162eca5b94e61d9825ec93306fc615d204 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Wed, 23 Nov 2016 08:55:18 -0700 Subject: SkImageEncoder: simplify API (re-land 248ff02 & 2cb6cb7, with changes) - Hide SkImageEncoder class in private header. - SkImageEncoder::Type becomes SkEncodedImageFormat - SkEncodedFormat becomes SkEncodedImageFormat - SkImageEncoder static functions replaced with single function EncodeImage() - utility wrappers for EncodeImage() are in sk_tool_utils.h TODO: remove link-time registration mechanism. TODO: clean up clients use of API and flip the flag. TODO: implement EncodeImage() in chromeium/skia/ext Change-Id: I47d451e50be4d5c6c130869c7fa7c2857243d9f0 Reviewed-on: https://skia-review.googlesource.com/4909 Reviewed-by: Mike Reed Reviewed-by: Leon Scroggins Reviewed-on: https://skia-review.googlesource.com/5186 Commit-Queue: Hal Canary Reviewed-by: Hal Canary --- src/codec/SkWebpCodec.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/codec/SkWebpCodec.h') diff --git a/src/codec/SkWebpCodec.h b/src/codec/SkWebpCodec.h index b9c493f204..93b60f646e 100644 --- a/src/codec/SkWebpCodec.h +++ b/src/codec/SkWebpCodec.h @@ -10,7 +10,7 @@ #include "SkCodec.h" #include "SkColorSpace.h" -#include "SkEncodedFormat.h" +#include "SkEncodedImageFormat.h" #include "SkImageInfo.h" #include "SkTypes.h" @@ -30,7 +30,7 @@ public: protected: Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, SkPMColor*, int*, int*) override; - SkEncodedFormat onGetEncodedFormat() const override { return kWEBP_SkEncodedFormat; } + SkEncodedImageFormat onGetEncodedFormat() const override { return SkEncodedImageFormat::kWEBP; } SkISize onGetScaledDimensions(float desiredScale) const override; -- cgit v1.2.3