Diff
Modified: trunk/Source/WebCore/ChangeLog (125115 => 125116)
--- trunk/Source/WebCore/ChangeLog 2012-08-08 23:55:46 UTC (rev 125115)
+++ trunk/Source/WebCore/ChangeLog 2012-08-08 23:56:50 UTC (rev 125116)
@@ -1,3 +1,24 @@
+2012-08-08 James Robinson <[email protected]>
+
+ [chromium] Add missing OVERRIDE and virtual annotations in compositor
+ https://bugs.webkit.org/show_bug.cgi?id=93438
+
+ Reviewed by Adrienne Walker.
+
+ As the title suggests.
+
+ * platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.h:
+ (BitmapCanvasLayerTextureUpdater):
+ * platform/graphics/chromium/ScrollbarLayerChromium.h:
+ (ScrollbarLayerChromium):
+ * platform/graphics/chromium/SolidColorLayerChromium.h:
+ (SolidColorLayerChromium):
+ * platform/graphics/chromium/cc/CCDelayBasedTimeSource.h:
+ * platform/graphics/chromium/cc/CCFrameRateController.h:
+ (CCFrameRateController):
+ * platform/graphics/chromium/cc/CCScrollbarLayerImpl.h:
+ (CCScrollbarLayerImpl):
+
2012-08-08 Eric Penner <[email protected]>
[chromium] Refactor tile flags.
Modified: trunk/Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.h (125115 => 125116)
--- trunk/Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.h 2012-08-08 23:55:46 UTC (rev 125115)
+++ trunk/Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.h 2012-08-08 23:56:50 UTC (rev 125116)
@@ -58,8 +58,8 @@
static PassRefPtr<BitmapCanvasLayerTextureUpdater> create(PassOwnPtr<LayerPainterChromium>);
virtual ~BitmapCanvasLayerTextureUpdater();
- virtual PassOwnPtr<LayerTextureUpdater::Texture> createTexture(CCPrioritizedTextureManager*);
- virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat);
+ virtual PassOwnPtr<LayerTextureUpdater::Texture> createTexture(CCPrioritizedTextureManager*) OVERRIDE;
+ virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat) OVERRIDE;
virtual void prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, float contentsWidthScale, float contentsHeightScale, IntRect& resultingOpaqueRect, CCRenderingStats&) OVERRIDE;
void updateTextureRect(CCResourceProvider*, CCPrioritizedTexture*, const IntRect& sourceRect, const IntRect& destRect);
Modified: trunk/Source/WebCore/platform/graphics/chromium/ScrollbarLayerChromium.h (125115 => 125116)
--- trunk/Source/WebCore/platform/graphics/chromium/ScrollbarLayerChromium.h 2012-08-08 23:55:46 UTC (rev 125115)
+++ trunk/Source/WebCore/platform/graphics/chromium/ScrollbarLayerChromium.h 2012-08-08 23:56:50 UTC (rev 125116)
@@ -42,7 +42,7 @@
class ScrollbarLayerChromium : public LayerChromium {
public:
- virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl();
+ virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
static PassRefPtr<ScrollbarLayerChromium> create(PassOwnPtr<WebKit::WebScrollbar>, WebKit::WebScrollbarThemePainter, PassOwnPtr<WebKit::WebScrollbarThemeGeometry>, int scrollLayerId);
// LayerChromium interface
@@ -54,7 +54,7 @@
int scrollLayerId() const { return m_scrollLayerId; }
void setScrollLayerId(int id) { m_scrollLayerId = id; }
- virtual ScrollbarLayerChromium* toScrollbarLayerChromium() { return this; }
+ virtual ScrollbarLayerChromium* toScrollbarLayerChromium() OVERRIDE { return this; }
protected:
ScrollbarLayerChromium(PassOwnPtr<WebKit::WebScrollbar>, WebKit::WebScrollbarThemePainter, PassOwnPtr<WebKit::WebScrollbarThemeGeometry>, int scrollLayerId);
Modified: trunk/Source/WebCore/platform/graphics/chromium/SolidColorLayerChromium.h (125115 => 125116)
--- trunk/Source/WebCore/platform/graphics/chromium/SolidColorLayerChromium.h 2012-08-08 23:55:46 UTC (rev 125115)
+++ trunk/Source/WebCore/platform/graphics/chromium/SolidColorLayerChromium.h 2012-08-08 23:56:50 UTC (rev 125116)
@@ -36,7 +36,7 @@
// setBackgroundColor() on the base class.
class SolidColorLayerChromium : public LayerChromium {
public:
- virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl();
+ virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
static PassRefPtr<SolidColorLayerChromium> create();
virtual ~SolidColorLayerChromium();
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCDelayBasedTimeSource.h (125115 => 125116)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCDelayBasedTimeSource.h 2012-08-08 23:55:46 UTC (rev 125115)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCDelayBasedTimeSource.h 2012-08-08 23:56:50 UTC (rev 125116)
@@ -44,6 +44,7 @@
virtual void setClient(CCTimeSourceClient* client) OVERRIDE { m_client = client; }
+ // CCTimeSource implementation
virtual void setTimebaseAndInterval(double timebase, double intervalSeconds) OVERRIDE;
virtual void setActive(bool) OVERRIDE;
@@ -51,8 +52,8 @@
// Get the last and next tick times.
// If not active, nextTickTime will return 0.
- virtual double lastTickTime();
- virtual double nextTickTime();
+ virtual double lastTickTime() OVERRIDE;
+ virtual double nextTickTime() OVERRIDE;
// CCTimerClient implementation.
virtual void onTimerFired() OVERRIDE;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCFrameRateController.h (125115 => 125116)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCFrameRateController.h 2012-08-08 23:55:46 UTC (rev 125115)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCFrameRateController.h 2012-08-08 23:56:50 UTC (rev 125116)
@@ -52,7 +52,7 @@
explicit CCFrameRateController(PassRefPtr<CCTimeSource>);
// Alternate form of CCFrameRateController with unthrottled frame-rate.
explicit CCFrameRateController(CCThread*);
- ~CCFrameRateController();
+ virtual ~CCFrameRateController();
void setClient(CCFrameRateControllerClient* client) { m_client = client; }
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.h (125115 => 125116)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.h 2012-08-08 23:55:46 UTC (rev 125115)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.h 2012-08-08 23:56:50 UTC (rev 125116)
@@ -63,7 +63,7 @@
virtual void appendQuads(CCQuadSink&, const CCSharedQuadState*, bool& hadMissingTiles) OVERRIDE;
- void didLoseContext() OVERRIDE;
+ virtual void didLoseContext() OVERRIDE;
protected:
explicit CCScrollbarLayerImpl(int id);
