Diff
Modified: trunk/Source/WebCore/ChangeLog (113901 => 113902)
--- trunk/Source/WebCore/ChangeLog 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebCore/ChangeLog 2012-04-11 20:19:45 UTC (rev 113902)
@@ -1,3 +1,42 @@
+2012-04-10 James Robinson <[email protected]>
+
+ [chromium] Add OVERRIDE annotations for cc layer types
+ https://bugs.webkit.org/show_bug.cgi?id=83658
+
+ Reviewed by Daniel Bates.
+
+ This adds OVERRIDE annotations to overrides of functions on these classes:
+ - CCLayerImpl
+ - LayerChromium
+ - TiledLayerChromium
+
+ * platform/graphics/chromium/Canvas2DLayerChromium.h:
+ (Canvas2DLayerChromium):
+ * platform/graphics/chromium/CanvasLayerChromium.h:
+ (CanvasLayerChromium):
+ * platform/graphics/chromium/ContentLayerChromium.h:
+ (ContentLayerChromium):
+ * platform/graphics/chromium/ImageLayerChromium.h:
+ (ImageLayerChromium):
+ * platform/graphics/chromium/PluginLayerChromium.h:
+ (PluginLayerChromium):
+ * platform/graphics/chromium/TiledLayerChromium.h:
+ (TiledLayerChromium):
+ * platform/graphics/chromium/VideoLayerChromium.h:
+ (VideoLayerChromium):
+ * platform/graphics/chromium/WebGLLayerChromium.h:
+ (WebGLLayerChromium):
+ * platform/graphics/chromium/cc/CCScrollbarLayerImpl.h:
+ (CCScrollbarLayerImpl):
+ * platform/graphics/chromium/cc/CCSolidColorLayerImpl.h:
+ (CCSolidColorLayerImpl):
+ * platform/graphics/chromium/cc/CCTextureLayerImpl.h:
+ (CCTextureLayerImpl):
+ * platform/graphics/chromium/cc/CCTiledLayerImpl.h:
+ (CCTiledLayerImpl):
+ * platform/graphics/chromium/cc/CCVideoLayerImpl.h:
+ (CCVideoLayerImpl):
+
2012-04-11 Alexey Proskuryakov <[email protected]>
[Mac] lang, xml:lang, content-language ignored when choosing fonts
Modified: trunk/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.h (113901 => 113902)
--- trunk/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.h 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.h 2012-04-11 20:19:45 UTC (rev 113902)
@@ -52,12 +52,12 @@
void setTextureId(unsigned);
- virtual void setNeedsDisplayRect(const FloatRect&);
+ virtual void setNeedsDisplayRect(const FloatRect&) OVERRIDE;
- virtual bool drawsContent() const;
- virtual void update(CCTextureUpdater&, const CCOcclusionTracker*);
- virtual void pushPropertiesTo(CCLayerImpl*);
- virtual void unreserveContentsTexture();
+ virtual bool drawsContent() const OVERRIDE;
+ virtual void update(CCTextureUpdater&, const CCOcclusionTracker*) OVERRIDE;
+ virtual void pushPropertiesTo(CCLayerImpl*) OVERRIDE;
+ virtual void unreserveContentsTexture() OVERRIDE;
void setCanvas(SkCanvas*);
Modified: trunk/Source/WebCore/platform/graphics/chromium/CanvasLayerChromium.h (113901 => 113902)
--- trunk/Source/WebCore/platform/graphics/chromium/CanvasLayerChromium.h 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebCore/platform/graphics/chromium/CanvasLayerChromium.h 2012-04-11 20:19:45 UTC (rev 113902)
@@ -41,7 +41,7 @@
// Base class for WebGL and accelerated 2d canvases.
class CanvasLayerChromium : public LayerChromium {
public:
- virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl();
+ virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
protected:
CanvasLayerChromium();
Modified: trunk/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h (113901 => 113902)
--- trunk/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h 2012-04-11 20:19:45 UTC (rev 113902)
@@ -57,19 +57,19 @@
void clearDelegate() { m_delegate = 0; }
- virtual bool drawsContent() const;
- virtual void update(CCTextureUpdater&, const CCOcclusionTracker*);
- virtual void idleUpdate(CCTextureUpdater&, const CCOcclusionTracker*);
+ virtual bool drawsContent() const OVERRIDE;
+ virtual void update(CCTextureUpdater&, const CCOcclusionTracker*) OVERRIDE;
+ virtual void idleUpdate(CCTextureUpdater&, const CCOcclusionTracker*) OVERRIDE;
- virtual void setOpaque(bool);
+ virtual void setOpaque(bool) OVERRIDE;
protected:
explicit ContentLayerChromium(ContentLayerDelegate*);
private:
- virtual LayerTextureUpdater* textureUpdater() const { return m_textureUpdater.get(); }
- virtual void createTextureUpdaterIfNeeded();
+ virtual LayerTextureUpdater* textureUpdater() const OVERRIDE { return m_textureUpdater.get(); }
+ virtual void createTextureUpdaterIfNeeded() OVERRIDE;
ContentLayerDelegate* m_delegate;
RefPtr<LayerTextureUpdater> m_textureUpdater;
Modified: trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h (113901 => 113902)
--- trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h 2012-04-11 20:19:45 UTC (rev 113902)
@@ -48,9 +48,9 @@
static PassRefPtr<ImageLayerChromium> create();
virtual ~ImageLayerChromium();
- virtual bool drawsContent() const;
- virtual void update(CCTextureUpdater&, const CCOcclusionTracker*);
- virtual bool needsContentsScale() const;
+ virtual bool drawsContent() const OVERRIDE;
+ virtual void update(CCTextureUpdater&, const CCOcclusionTracker*) OVERRIDE;
+ virtual bool needsContentsScale() const OVERRIDE;
void setContents(Image* image);
@@ -59,9 +59,9 @@
void setTilingOption(TilingOption);
- virtual LayerTextureUpdater* textureUpdater() const;
- virtual void createTextureUpdaterIfNeeded();
- virtual IntSize contentBounds() const;
+ virtual LayerTextureUpdater* textureUpdater() const OVERRIDE;
+ virtual void createTextureUpdaterIfNeeded() OVERRIDE;
+ virtual IntSize contentBounds() const OVERRIDE;
NativeImagePtr m_imageForCurrentFrame;
RefPtr<Image> m_contents;
Modified: trunk/Source/WebCore/platform/graphics/chromium/PluginLayerChromium.h (113901 => 113902)
--- trunk/Source/WebCore/platform/graphics/chromium/PluginLayerChromium.h 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebCore/platform/graphics/chromium/PluginLayerChromium.h 2012-04-11 20:19:45 UTC (rev 113902)
@@ -38,7 +38,7 @@
public:
static PassRefPtr<PluginLayerChromium> create();
- virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl();
+ virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
// Code path for plugins which supply their own texture ID.
void setTextureId(unsigned textureId);
@@ -52,7 +52,7 @@
void setIOSurfaceProperties(int width, int height, uint32_t ioSurfaceId);
uint32_t getIOSurfaceId() const;
- virtual void pushPropertiesTo(CCLayerImpl*);
+ virtual void pushPropertiesTo(CCLayerImpl*) OVERRIDE;
protected:
PluginLayerChromium();
Modified: trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.h (113901 => 113902)
--- trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.h 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.h 2012-04-11 20:19:45 UTC (rev 113902)
@@ -42,28 +42,28 @@
virtual ~TiledLayerChromium();
- virtual void setIsMask(bool);
+ virtual void setIsMask(bool) OVERRIDE;
- virtual void pushPropertiesTo(CCLayerImpl*);
+ virtual void pushPropertiesTo(CCLayerImpl*) OVERRIDE;
- virtual bool drawsContent() const;
- virtual bool needsContentsScale() const;
+ virtual bool drawsContent() const OVERRIDE;
+ virtual bool needsContentsScale() const OVERRIDE;
- virtual IntSize contentBounds() const;
+ virtual IntSize contentBounds() const OVERRIDE;
- virtual void setNeedsDisplayRect(const FloatRect&);
+ virtual void setNeedsDisplayRect(const FloatRect&) OVERRIDE;
- virtual void setIsNonCompositedContent(bool);
+ virtual void setIsNonCompositedContent(bool) OVERRIDE;
- virtual void setLayerTreeHost(CCLayerTreeHost*);
+ virtual void setLayerTreeHost(CCLayerTreeHost*) OVERRIDE;
// Reserves all existing and valid tile textures to protect them from being
// recycled by the texture manager.
void protectTileTextures(const IntRect& layerRect);
- virtual void reserveTextures();
+ virtual void reserveTextures() OVERRIDE;
- virtual Region visibleContentOpaqueRegion() const;
+ virtual Region visibleContentOpaqueRegion() const OVERRIDE;
protected:
TiledLayerChromium();
@@ -100,12 +100,13 @@
bool skipsDraw() const { return m_skipsDraw; }
- virtual void protectVisibleTileTextures();
+ virtual void protectVisibleTileTextures() OVERRIDE;
+ // Virtual for testing
virtual TextureManager* textureManager() const;
private:
- virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl();
+ virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
void createTilerIfNeeded();
void setTilingOption(TilingOption);
Modified: trunk/Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h (113901 => 113902)
--- trunk/Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h 2012-04-11 20:19:45 UTC (rev 113902)
@@ -48,7 +48,7 @@
static PassRefPtr<VideoLayerChromium> create(VideoFrameProvider* = 0);
virtual ~VideoLayerChromium();
- virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl();
+ virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
private:
explicit VideoLayerChromium(VideoFrameProvider*);
Modified: trunk/Source/WebCore/platform/graphics/chromium/WebGLLayerChromium.h (113901 => 113902)
--- trunk/Source/WebCore/platform/graphics/chromium/WebGLLayerChromium.h 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebCore/platform/graphics/chromium/WebGLLayerChromium.h 2012-04-11 20:19:45 UTC (rev 113902)
@@ -49,10 +49,10 @@
virtual ~WebGLLayerChromium();
- virtual bool drawsContent() const;
- virtual void update(CCTextureUpdater&, const CCOcclusionTracker*);
- virtual void pushPropertiesTo(CCLayerImpl*);
- virtual void setNeedsDisplayRect(const FloatRect&);
+ virtual bool drawsContent() const OVERRIDE;
+ virtual void update(CCTextureUpdater&, const CCOcclusionTracker*) OVERRIDE;
+ virtual void pushPropertiesTo(CCLayerImpl*) OVERRIDE;
+ virtual void setNeedsDisplayRect(const FloatRect&) OVERRIDE;
bool paintRenderedResultsToCanvas(ImageBuffer*);
GraphicsContext3D* context() const;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.h (113901 => 113902)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.h 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.h 2012-04-11 20:19:45 UTC (rev 113902)
@@ -59,9 +59,9 @@
CCLayerImpl* scrollLayer() const { return m_scrollLayer; }
void setScrollLayer(CCLayerImpl* scrollLayer) { m_scrollLayer = scrollLayer; }
- virtual void willDraw(LayerRendererChromium*);
- virtual void appendQuads(CCQuadCuller&, const CCSharedQuadState*, bool& hadMissingTiles);
- virtual void didDraw();
+ virtual void willDraw(LayerRendererChromium*) OVERRIDE;
+ virtual void appendQuads(CCQuadCuller&, const CCSharedQuadState*, bool& hadMissingTiles) OVERRIDE;
+ virtual void didDraw() OVERRIDE;
protected:
explicit CCScrollbarLayerImpl(int id);
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCSolidColorLayerImpl.h (113901 => 113902)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCSolidColorLayerImpl.h 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCSolidColorLayerImpl.h 2012-04-11 20:19:45 UTC (rev 113902)
@@ -41,14 +41,14 @@
}
virtual ~CCSolidColorLayerImpl();
- virtual TransformationMatrix quadTransform() const;
- virtual void appendQuads(CCQuadCuller&, const CCSharedQuadState*, bool& hadMissingTiles);
+ virtual TransformationMatrix quadTransform() const OVERRIDE;
+ virtual void appendQuads(CCQuadCuller&, const CCSharedQuadState*, bool& hadMissingTiles) OVERRIDE;
protected:
explicit CCSolidColorLayerImpl(int id);
private:
- virtual const char* layerTypeAsString() const { return "SolidColorLayer"; }
+ virtual const char* layerTypeAsString() const OVERRIDE { return "SolidColorLayer"; }
const int m_tileSize;
};
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCTextureLayerImpl.h (113901 => 113902)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCTextureLayerImpl.h 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCTextureLayerImpl.h 2012-04-11 20:19:45 UTC (rev 113902)
@@ -40,7 +40,7 @@
}
virtual ~CCTextureLayerImpl();
- virtual void appendQuads(CCQuadCuller&, const CCSharedQuadState*, bool& hadMissingTiles);
+ virtual void appendQuads(CCQuadCuller&, const CCSharedQuadState*, bool& hadMissingTiles) OVERRIDE;
typedef ProgramBinding<VertexShaderPosTex, FragmentShaderRGBATexFlipAlpha> ProgramFlip;
typedef ProgramBinding<VertexShaderPosTexStretch, FragmentShaderRGBATexAlpha> ProgramStretch;
@@ -48,10 +48,10 @@
typedef ProgramBinding<VertexShaderPosTexTransform, FragmentShaderRGBATexRectAlpha> TexRectProgram;
typedef ProgramBinding<VertexShaderPosTexTransform, FragmentShaderRGBATexRectFlipAlpha> TexRectProgramFlip;
- virtual void willDraw(LayerRendererChromium*);
- virtual void didLoseContext();
+ virtual void willDraw(LayerRendererChromium*) OVERRIDE;
+ virtual void didLoseContext() OVERRIDE;
- virtual void dumpLayerProperties(TextStream&, int indent) const;
+ virtual void dumpLayerProperties(TextStream&, int indent) const OVERRIDE;
unsigned textureId() const { return m_textureId; }
void setTextureId(unsigned id) { m_textureId = id; }
@@ -65,7 +65,7 @@
private:
explicit CCTextureLayerImpl(int);
- virtual const char* layerTypeAsString() const { return "TextureLayer"; }
+ virtual const char* layerTypeAsString() const OVERRIDE { return "TextureLayer"; }
unsigned m_textureId;
bool m_hasAlpha;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.h (113901 => 113902)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.h 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.h 2012-04-11 20:19:45 UTC (rev 113902)
@@ -43,11 +43,11 @@
}
virtual ~CCTiledLayerImpl();
- virtual void appendQuads(CCQuadCuller&, const CCSharedQuadState*, bool& hadMissingTiles);
+ virtual void appendQuads(CCQuadCuller&, const CCSharedQuadState*, bool& hadMissingTiles) OVERRIDE;
- virtual void bindContentsTexture(LayerRendererChromium*);
+ virtual void bindContentsTexture(LayerRendererChromium*) OVERRIDE;
- virtual void dumpLayerProperties(TextStream&, int indent) const;
+ virtual void dumpLayerProperties(TextStream&, int indent) const OVERRIDE;
void setSkipsDraw(bool skipsDraw) { m_skipsDraw = skipsDraw; }
void setTilingData(const CCLayerTilingData& tiler);
@@ -56,7 +56,7 @@
void setContentsSwizzled(bool contentsSwizzled) { m_contentsSwizzled = contentsSwizzled; }
bool contentsSwizzled() const { return m_contentsSwizzled; }
- virtual Region visibleContentOpaqueRegion() const;
+ virtual Region visibleContentOpaqueRegion() const OVERRIDE;
typedef ProgramBinding<VertexShaderTile, FragmentShaderRGBATexAlpha> Program;
// Shader program that swaps red and blue components of texture.
@@ -77,11 +77,11 @@
bool hasTileAt(int, int) const;
bool hasTextureIdForTileAt(int, int) const;
- virtual TransformationMatrix quadTransform() const;
+ virtual TransformationMatrix quadTransform() const OVERRIDE;
private:
- virtual const char* layerTypeAsString() const { return "ContentLayer"; }
+ virtual const char* layerTypeAsString() const OVERRIDE { return "ContentLayer"; }
DrawableTile* tileAt(int, int) const;
DrawableTile* createTile(int, int);
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.h (113901 => 113902)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.h 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.h 2012-04-11 20:19:45 UTC (rev 113902)
@@ -49,16 +49,16 @@
}
virtual ~CCVideoLayerImpl();
- virtual void willDraw(LayerRendererChromium*);
- virtual void appendQuads(CCQuadCuller&, const CCSharedQuadState*, bool& hadMissingTiles);
- virtual void didDraw();
+ virtual void willDraw(LayerRendererChromium*) OVERRIDE;
+ virtual void appendQuads(CCQuadCuller&, const CCSharedQuadState*, bool& hadMissingTiles) OVERRIDE;
+ virtual void didDraw() OVERRIDE;
typedef ProgramBinding<VertexShaderPosTexTransform, FragmentShaderRGBATexFlipAlpha> RGBAProgram;
typedef ProgramBinding<VertexShaderPosTexYUVStretch, FragmentShaderYUVVideo> YUVProgram;
typedef ProgramBinding<VertexShaderPosTexTransform, FragmentShaderRGBATexFlipAlpha> NativeTextureProgram;
typedef ProgramBinding<VertexShaderVideoTransform, FragmentShaderOESImageExternal> StreamTextureProgram;
- virtual void dumpLayerProperties(TextStream&, int indent) const;
+ virtual void dumpLayerProperties(TextStream&, int indent) const OVERRIDE;
Mutex& providerMutex() { return m_providerMutex; }
VideoFrameProvider* provider() const { return m_provider; }
@@ -84,7 +84,7 @@
explicit CCVideoLayerImpl(int, VideoFrameProvider*);
static IntSize computeVisibleSize(const VideoFrameChromium*, unsigned plane);
- virtual const char* layerTypeAsString() const { return "VideoLayer"; }
+ virtual const char* layerTypeAsString() const OVERRIDE { return "VideoLayer"; }
bool reserveTextures(const VideoFrameChromium*, GC3Denum format, LayerRendererChromium*);
Modified: trunk/Source/WebKit/chromium/ChangeLog (113901 => 113902)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-11 20:19:45 UTC (rev 113902)
@@ -1,3 +1,28 @@
+2012-04-10 James Robinson <[email protected]>
+
+ [chromium] Add OVERRIDE annotations for cc layer types
+ https://bugs.webkit.org/show_bug.cgi?id=83658
+
+ Reviewed by Daniel Bates.
+
+ This adds OVERRIDE annotations to overrides of functions on these classes:
+ - CCLayerImpl
+ - LayerChromium
+ - TiledLayerChromium
+
+ * src/WebLayerImpl.cpp:
+ * src/WebLayerImpl.h:
+ (WebLayerImpl): Removed unused and empty paintContents() function.
+ * tests/CCLayerIteratorTest.cpp:
+ * tests/CCLayerTreeHostCommonTest.cpp:
+ * tests/CCLayerTreeHostImplTest.cpp:
+ * tests/CCLayerTreeHostTest.cpp:
+ * tests/CCOcclusionTrackerTest.cpp:
+ * tests/CCTiledLayerTestCommon.h:
+ (FakeTiledLayerChromium):
+ * tests/LayerChromiumTest.cpp:
+ * tests/TreeSynchronizerTest.cpp:
+
2012-04-11 James Robinson <[email protected]>
[chromium] Add OVERRIDE annotations for cc animation-related interfaces
Modified: trunk/Source/WebKit/chromium/src/WebLayerImpl.cpp (113901 => 113902)
--- trunk/Source/WebKit/chromium/src/WebLayerImpl.cpp 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebKit/chromium/src/WebLayerImpl.cpp 2012-04-11 20:19:45 UTC (rev 113902)
@@ -47,8 +47,4 @@
{
}
-void WebLayerImpl::paintContents(GraphicsContext&, const IntRect& clip)
-{
-}
-
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebLayerImpl.h (113901 => 113902)
--- trunk/Source/WebKit/chromium/src/WebLayerImpl.h 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebKit/chromium/src/WebLayerImpl.h 2012-04-11 20:19:45 UTC (rev 113902)
@@ -38,7 +38,6 @@
protected:
WebLayerImpl();
virtual ~WebLayerImpl();
- virtual void paintContents(WebCore::GraphicsContext&, const WebCore::IntRect& clip);
};
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/tests/CCLayerIteratorTest.cpp (113901 => 113902)
--- trunk/Source/WebKit/chromium/tests/CCLayerIteratorTest.cpp 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebKit/chromium/tests/CCLayerIteratorTest.cpp 2012-04-11 20:19:45 UTC (rev 113902)
@@ -47,7 +47,7 @@
int m_countRepresentingContributingSurface;
int m_countRepresentingItself;
- virtual bool drawsContent() const { return m_drawsContent; }
+ virtual bool drawsContent() const OVERRIDE { return m_drawsContent; }
void setDrawsContent(bool drawsContent) { m_drawsContent = drawsContent; }
private:
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostCommonTest.cpp (113901 => 113902)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostCommonTest.cpp 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostCommonTest.cpp 2012-04-11 20:19:45 UTC (rev 113902)
@@ -81,7 +81,7 @@
{
}
- virtual bool drawsContent() const { return true; }
+ virtual bool drawsContent() const OVERRIDE { return true; }
};
TEST(CCLayerTreeHostCommonTest, verifyTransformsForNoOpLayer)
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp (113901 => 113902)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp 2012-04-11 20:19:45 UTC (rev 113902)
@@ -587,7 +587,7 @@
public:
static PassOwnPtr<BlendStateCheckLayer> create(int id) { return adoptPtr(new BlendStateCheckLayer(id)); }
- virtual void appendQuads(CCQuadCuller& quadList, const CCSharedQuadState* sharedQuadState, bool&)
+ virtual void appendQuads(CCQuadCuller& quadList, const CCSharedQuadState* sharedQuadState, bool&) OVERRIDE
{
m_quadsAppended = true;
@@ -1066,7 +1066,7 @@
public:
static PassOwnPtr<ContextLostNotificationCheckLayer> create(int id) { return adoptPtr(new ContextLostNotificationCheckLayer(id)); }
- virtual void didLoseContext()
+ virtual void didLoseContext() OVERRIDE
{
m_didLoseContextCalled = true;
}
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp (113901 => 113902)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2012-04-11 20:19:45 UTC (rev 113902)
@@ -1430,13 +1430,13 @@
int idlePaintContentsCount() { return m_idlePaintContentsCount; }
void resetPaintContentsCount() { m_paintContentsCount = 0; m_idlePaintContentsCount = 0;}
- virtual void update(CCTextureUpdater& updater, const CCOcclusionTracker* occlusion)
+ virtual void update(CCTextureUpdater& updater, const CCOcclusionTracker* occlusion) OVERRIDE
{
ContentLayerChromium::update(updater, occlusion);
m_paintContentsCount++;
}
- virtual void idleUpdate(CCTextureUpdater& updater, const CCOcclusionTracker* occlusion)
+ virtual void idleUpdate(CCTextureUpdater& updater, const CCOcclusionTracker* occlusion) OVERRIDE
{
ContentLayerChromium::idleUpdate(updater, occlusion);
m_idlePaintContentsCount++;
@@ -1778,14 +1778,14 @@
public:
static PassRefPtr<TestLayerChromium> create() { return adoptRef(new TestLayerChromium()); }
- virtual void update(CCTextureUpdater&, const CCOcclusionTracker* occlusion)
+ virtual void update(CCTextureUpdater&, const CCOcclusionTracker* occlusion) OVERRIDE
{
// Gain access to internals of the CCOcclusionTracker.
const TestCCOcclusionTracker* testOcclusion = static_cast<const TestCCOcclusionTracker*>(occlusion);
m_occludedScreenSpace = testOcclusion ? testOcclusion->occlusionInScreenSpace() : Region();
}
- virtual bool drawsContent() const { return true; }
+ virtual bool drawsContent() const OVERRIDE { return true; }
const Region& occludedScreenSpace() const { return m_occludedScreenSpace; }
void clearOccludedScreenSpace() { m_occludedScreenSpace = Region(); }
Modified: trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp (113901 => 113902)
--- trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp 2012-04-11 20:19:45 UTC (rev 113902)
@@ -60,8 +60,8 @@
{
}
- virtual bool drawsContent() const { return true; }
- virtual Region visibleContentOpaqueRegion() const
+ virtual bool drawsContent() const OVERRIDE { return true; }
+ virtual Region visibleContentOpaqueRegion() const OVERRIDE
{
if (m_overrideOpaqueContentsRect)
return intersection(m_opaqueContentsRect, visibleLayerRect());
@@ -87,7 +87,7 @@
setDrawsContent(true);
}
- virtual Region visibleContentOpaqueRegion() const
+ virtual Region visibleContentOpaqueRegion() const OVERRIDE
{
if (m_overrideOpaqueContentsRect)
return intersection(m_opaqueContentsRect, visibleLayerRect());
Modified: trunk/Source/WebKit/chromium/tests/CCTiledLayerTestCommon.h (113901 => 113902)
--- trunk/Source/WebKit/chromium/tests/CCTiledLayerTestCommon.h 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebKit/chromium/tests/CCTiledLayerTestCommon.h 2012-04-11 20:19:45 UTC (rev 113902)
@@ -117,19 +117,19 @@
using WebCore::TiledLayerChromium::numPaintedTiles;
using WebCore::TiledLayerChromium::idlePaintRect;
- virtual void setNeedsDisplayRect(const WebCore::FloatRect&);
+ virtual void setNeedsDisplayRect(const WebCore::FloatRect&) OVERRIDE;
const WebCore::FloatRect& lastNeedsDisplayRect() const { return m_lastNeedsDisplayRect; }
// Updates the visibleLayerRect().
- virtual void update(WebCore::CCTextureUpdater&, const WebCore::CCOcclusionTracker*);
+ virtual void update(WebCore::CCTextureUpdater&, const WebCore::CCOcclusionTracker*) OVERRIDE;
- virtual WebCore::TextureManager* textureManager() const { return m_textureManager; }
+ virtual WebCore::TextureManager* textureManager() const OVERRIDE { return m_textureManager; }
FakeLayerTextureUpdater* fakeLayerTextureUpdater() { return m_fakeTextureUpdater.get(); }
WebCore::FloatRect updateRect() { return m_updateRect; }
private:
- virtual WebCore::LayerTextureUpdater* textureUpdater() const { return m_fakeTextureUpdater.get(); }
- virtual void createTextureUpdaterIfNeeded() { }
+ virtual WebCore::LayerTextureUpdater* textureUpdater() const OVERRIDE { return m_fakeTextureUpdater.get(); }
+ virtual void createTextureUpdaterIfNeeded() OVERRIDE { }
RefPtr<FakeLayerTextureUpdater> m_fakeTextureUpdater;
WebCore::TextureManager* m_textureManager;
@@ -141,7 +141,7 @@
explicit FakeTiledLayerWithScaledBounds(WebCore::TextureManager*);
void setContentBounds(const WebCore::IntSize& contentBounds) { m_forcedContentBounds = contentBounds; }
- virtual WebCore::IntSize contentBounds() const { return m_forcedContentBounds; }
+ virtual WebCore::IntSize contentBounds() const OVERRIDE { return m_forcedContentBounds; }
protected:
WebCore::IntSize m_forcedContentBounds;
Modified: trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp (113901 => 113902)
--- trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp 2012-04-11 20:19:45 UTC (rev 113902)
@@ -561,12 +561,12 @@
{
}
- virtual bool needsContentsScale() const
+ virtual bool needsContentsScale() const OVERRIDE
{
return true;
}
- virtual void setNeedsDisplayRect(const FloatRect& dirtyRect)
+ virtual void setNeedsDisplayRect(const FloatRect& dirtyRect) OVERRIDE
{
m_lastNeedsDisplayRect = dirtyRect;
LayerChromium::setNeedsDisplayRect(dirtyRect);
Modified: trunk/Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp (113901 => 113902)
--- trunk/Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp 2012-04-11 20:16:47 UTC (rev 113901)
+++ trunk/Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp 2012-04-11 20:19:45 UTC (rev 113902)
@@ -73,12 +73,12 @@
virtual ~MockLayerChromium() { }
- virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl()
+ virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE
{
return MockCCLayerImpl::create(m_layerId);
}
- virtual void pushPropertiesTo(CCLayerImpl* ccLayer)
+ virtual void pushPropertiesTo(CCLayerImpl* ccLayer) OVERRIDE
{
LayerChromium::pushPropertiesTo(ccLayer);
