| Index: Source/WebKit/chromium/tests/ImageLayerChromiumTest.cpp
|
| diff --git a/Source/WebKit/chromium/tests/ImageLayerChromiumTest.cpp b/Source/WebKit/chromium/tests/ImageLayerChromiumTest.cpp
|
| index 5fd3275d135980e4c5c3842c00c9f3809e379fdc..e2e5a5aa7fe73c24ad3b218a4c2dc9b66b7296cc 100644
|
| --- a/Source/WebKit/chromium/tests/ImageLayerChromiumTest.cpp
|
| +++ b/Source/WebKit/chromium/tests/ImageLayerChromiumTest.cpp
|
| @@ -37,8 +37,8 @@ namespace {
|
|
|
| class MockGraphicsLayerClient : public GraphicsLayerClient {
|
| public:
|
| - virtual void notifyAnimationStarted(const GraphicsLayer*, double time) { }
|
| - virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect& inClip) { }
|
| + virtual void notifyAnimationStarted(const GraphicsLayer*, double time) OVERRIDE { }
|
| + virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect& inClip) OVERRIDE { }
|
| };
|
|
|
| class TestImage : public Image {
|
| @@ -60,22 +60,22 @@ public:
|
| m_nativeImage->bitmap().setIsOpaque(opaque);
|
| }
|
|
|
| - virtual bool isBitmapImage() const
|
| + virtual bool isBitmapImage() const OVERRIDE
|
| {
|
| return true;
|
| }
|
|
|
| - virtual bool currentFrameKnownToBeOpaque()
|
| + virtual bool currentFrameKnownToBeOpaque() OVERRIDE
|
| {
|
| return m_nativeImage->bitmap().isOpaque();
|
| }
|
|
|
| - virtual IntSize size() const
|
| + virtual IntSize size() const OVERRIDE
|
| {
|
| return m_size;
|
| }
|
|
|
| - virtual PassRefPtr<NativeImageSkia> nativeImageForCurrentFrame()
|
| + virtual PassRefPtr<NativeImageSkia> nativeImageForCurrentFrame() OVERRIDE
|
| {
|
| if (m_size.isZero())
|
| return 0;
|
| @@ -84,18 +84,16 @@ public:
|
| }
|
|
|
| // Stub implementations of pure virtual Image functions.
|
| - virtual void destroyDecodedData(bool)
|
| + virtual void destroyDecodedData() OVERRIDE
|
| {
|
| }
|
|
|
| - virtual unsigned int decodedSize() const
|
| + virtual unsigned decodedSize() const OVERRIDE
|
| {
|
| return 0u;
|
| }
|
|
|
| - virtual void draw(WebCore::GraphicsContext*, const WebCore::FloatRect&,
|
| - const WebCore::FloatRect&, WebCore::ColorSpace,
|
| - WebCore::CompositeOperator, WebCore::BlendMode)
|
| + virtual void draw(GraphicsContext*, const FloatRect&, const FloatRect&, ColorSpace, CompositeOperator, BlendMode) OVERRIDE
|
| {
|
| }
|
|
|
|
|