| Index: Source/platform/graphics/ImageFrameGeneratorTest.cpp
|
| diff --git a/Source/platform/graphics/ImageFrameGeneratorTest.cpp b/Source/platform/graphics/ImageFrameGeneratorTest.cpp
|
| index 0d5390c08189ce95fc5ee750437683fc499d3232..e49be9b60581d1cf76f96d6f1e1251709b8e6013 100644
|
| --- a/Source/platform/graphics/ImageFrameGeneratorTest.cpp
|
| +++ b/Source/platform/graphics/ImageFrameGeneratorTest.cpp
|
| @@ -50,7 +50,7 @@ SkImageInfo imageInfo()
|
|
|
| class ImageFrameGeneratorTest : public ::testing::Test, public MockImageDecoderClient {
|
| public:
|
| - virtual void SetUp() OVERRIDE
|
| + virtual void SetUp() override
|
| {
|
| ImageDecodingStore::instance()->setCacheLimitInBytes(1024 * 1024);
|
| m_data = SharedBuffer::create();
|
| @@ -61,31 +61,31 @@ public:
|
| m_status = ImageFrame::FrameEmpty;
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE
|
| + virtual void TearDown() override
|
| {
|
| ImageDecodingStore::instance()->clear();
|
| }
|
|
|
| - virtual void decoderBeingDestroyed() OVERRIDE
|
| + virtual void decoderBeingDestroyed() override
|
| {
|
| ++m_decodersDestroyed;
|
| }
|
|
|
| - virtual void frameBufferRequested() OVERRIDE
|
| + virtual void frameBufferRequested() override
|
| {
|
| ++m_frameBufferRequestCount;
|
| }
|
|
|
| - virtual ImageFrame::Status status() OVERRIDE
|
| + virtual ImageFrame::Status status() override
|
| {
|
| ImageFrame::Status currentStatus = m_status;
|
| m_status = m_nextFrameStatus;
|
| return currentStatus;
|
| }
|
|
|
| - virtual size_t frameCount() OVERRIDE { return 1; }
|
| - virtual int repetitionCount() const OVERRIDE { return cAnimationNone; }
|
| - virtual float frameDuration() const OVERRIDE { return 0; }
|
| + virtual size_t frameCount() override { return 1; }
|
| + virtual int repetitionCount() const override { return cAnimationNone; }
|
| + virtual float frameDuration() const override { return 0; }
|
|
|
| protected:
|
| void useMockImageDecoderFactory()
|
|
|