| Index: tools/SkBitmapRegionDecoder.h
|
| diff --git a/tools/SkBitmapRegionDecoderInterface.h b/tools/SkBitmapRegionDecoder.h
|
| similarity index 91%
|
| rename from tools/SkBitmapRegionDecoderInterface.h
|
| rename to tools/SkBitmapRegionDecoder.h
|
| index 8e19e95a0a9867557dce940725d6b714e46627e8..618ab16f5ddb98e6e60c252da5df889430034e08 100644
|
| --- a/tools/SkBitmapRegionDecoderInterface.h
|
| +++ b/tools/SkBitmapRegionDecoder.h
|
| @@ -16,7 +16,7 @@
|
| * This class aims to provide an interface to test multiple implementations of
|
| * SkBitmapRegionDecoder.
|
| */
|
| -class SkBitmapRegionDecoderInterface {
|
| +class SkBitmapRegionDecoder {
|
| public:
|
|
|
| enum Strategy {
|
| @@ -30,7 +30,7 @@ public:
|
| * @param strategy Strategy used for scaling and subsetting
|
| * @return Tries to create an SkBitmapRegionDecoder, returns NULL on failure
|
| */
|
| - static SkBitmapRegionDecoderInterface* CreateBitmapRegionDecoder(
|
| + static SkBitmapRegionDecoder* Create(
|
| SkData* data, Strategy strategy);
|
|
|
| /*
|
| @@ -38,7 +38,7 @@ public:
|
| * @param strategy Strategy used for scaling and subsetting
|
| * @return Tries to create an SkBitmapRegionDecoder, returns NULL on failure
|
| */
|
| - static SkBitmapRegionDecoderInterface* CreateBitmapRegionDecoder(
|
| + static SkBitmapRegionDecoder* Create(
|
| SkStreamRewindable* stream, Strategy strategy);
|
|
|
| /*
|
| @@ -73,11 +73,11 @@ public:
|
| int width() const { return fWidth; }
|
| int height() const { return fHeight; }
|
|
|
| - virtual ~SkBitmapRegionDecoderInterface() {}
|
| + virtual ~SkBitmapRegionDecoder() {}
|
|
|
| protected:
|
|
|
| - SkBitmapRegionDecoderInterface(int width, int height)
|
| + SkBitmapRegionDecoder(int width, int height)
|
| : fWidth(width)
|
| , fHeight(height)
|
| {}
|
|
|