move to new ImageGenerator API

This will allow us to remove SK_SUPPORT_LEGACY_IMAGEGENERATORAPI

BUG=

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

git-svn-id: svn://svn.chromium.org/blink/trunk@175168 bbb929c8-8fbe-4397-9dbb-9b2b20218538

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

@@ -47,7 +47,7 @@ DecodingImageGenerator::~DecodingImageGenerator()
 {
 }
 
-SkData* DecodingImageGenerator::refEncodedData()
+SkData* DecodingImageGenerator::onRefEncodedData()
 {
     // FIXME: If the image has been clipped or scaled, do not return the original
     // encoded data, since on playback it will not be known how the clipping/scaling
@@ -55,19 +55,18 @@ SkData* DecodingImageGenerator::refEncodedData()
     RefPtr<SharedBuffer> buffer = nullptr;
     bool allDataReceived = false;
     m_frameGenerator->copyData(&buffer, &allDataReceived);
-    if (buffer && allDataReceived) {
+    if (buffer && allDataReceived)
         return SkData::NewWithCopy(buffer->data(), buffer->size());
-    }
     return 0;
 }
 
-bool DecodingImageGenerator::getInfo(SkImageInfo* info)
+bool DecodingImageGenerator::onGetInfo(SkImageInfo* info)
 {
     *info = m_imageInfo;
     return true;
 }
 
-bool DecodingImageGenerator::getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes)
+bool DecodingImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor ctable[], int* ctableCount)
 {
     TRACE_EVENT1("webkit", "DecodingImageGenerator::getPixels", "index", static_cast<int>(m_frameIndex));
 

third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.h

@@ -47,13 +47,13 @@ public:
     DecodingImageGenerator(PassRefPtr<ImageFrameGenerator>, const SkImageInfo&, size_t index);
     virtual ~DecodingImageGenerator();
 
-    // SkImageGenerator implementation.
-    virtual SkData* refEncodedData() OVERRIDE;
-    virtual bool getInfo(SkImageInfo*) OVERRIDE;
-    virtual bool getPixels(const SkImageInfo&, void* pixels, size_t rowBytes) OVERRIDE;
-
     void setGenerationId(size_t id) { m_generationId = id; }
 
+protected:
+    virtual SkData* onRefEncodedData() OVERRIDE;
+    virtual bool onGetInfo(SkImageInfo*) OVERRIDE;
+    virtual bool onGetPixels(const SkImageInfo&, void* pixels, size_t rowBytes, SkPMColor ctable[], int* ctableCount) OVERRIDE;
+
 private:
     RefPtr<ImageFrameGenerator> m_frameGenerator;
     SkImageInfo m_imageInfo;