Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Unified Diff: webkit/compositor_bindings/web_layer_tree_view_impl.h

Issue 12250021: Remove OVERRIDE annotations from implementations of WebKit APIs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/compositor_bindings/web_layer_tree_view_impl.h
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.h b/webkit/compositor_bindings/web_layer_tree_view_impl.h
index de6b6aeacfd090f387f05044576d98d3f2c00ff8..72c14edcbacd52cd289bac9e50cd96de809cbb0b 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_impl.h
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl.h
@@ -33,30 +33,30 @@ public:
WEBKIT_COMPOSITOR_BINDINGS_EXPORT cc::LayerTreeHost* layer_tree_host() const;
// WebLayerTreeView implementation.
- virtual void setSurfaceReady() OVERRIDE;
- virtual void setRootLayer(const WebLayer&) OVERRIDE;
- virtual void clearRootLayer() OVERRIDE;
- virtual void setViewportSize(const WebSize& layoutViewportSize, const WebSize& deviceViewportSize) OVERRIDE;
- virtual WebSize layoutViewportSize() const OVERRIDE;
- virtual WebSize deviceViewportSize() const OVERRIDE;
+ virtual void setSurfaceReady();
+ virtual void setRootLayer(const WebLayer&);
+ virtual void clearRootLayer();
+ virtual void setViewportSize(const WebSize& layoutViewportSize, const WebSize& deviceViewportSize);
+ virtual WebSize layoutViewportSize() const;
+ virtual WebSize deviceViewportSize() const;
virtual WebFloatPoint adjustEventPointForPinchZoom(const WebFloatPoint& point) const; // FIXME: remove this after WebKit roll.
- virtual void setDeviceScaleFactor(float) OVERRIDE;
- virtual float deviceScaleFactor() const OVERRIDE;
- virtual void setBackgroundColor(WebColor) OVERRIDE;
- virtual void setHasTransparentBackground(bool) OVERRIDE;
- virtual void setVisible(bool) OVERRIDE;
- virtual void setPageScaleFactorAndLimits(float pageScaleFactor, float minimum, float maximum) OVERRIDE;
- virtual void startPageScaleAnimation(const WebPoint& destination, bool useAnchor, float newPageScale, double durationSec) OVERRIDE;
- virtual void setNeedsAnimate() OVERRIDE;
- virtual void setNeedsRedraw() OVERRIDE;
- virtual bool commitRequested() const OVERRIDE;
- virtual void composite() OVERRIDE;
- virtual void updateAnimations(double frameBeginTime) OVERRIDE;
- virtual void didStopFlinging() OVERRIDE;
- virtual bool compositeAndReadback(void *pixels, const WebRect&) OVERRIDE;
- virtual void finishAllRendering() OVERRIDE;
- virtual void setDeferCommits(bool deferCommits) OVERRIDE;
- virtual void renderingStats(WebRenderingStats&) const OVERRIDE;
+ virtual void setDeviceScaleFactor(float);
+ virtual float deviceScaleFactor() const;
+ virtual void setBackgroundColor(WebColor);
+ virtual void setHasTransparentBackground(bool);
+ virtual void setVisible(bool);
+ virtual void setPageScaleFactorAndLimits(float pageScaleFactor, float minimum, float maximum);
+ virtual void startPageScaleAnimation(const WebPoint& destination, bool useAnchor, float newPageScale, double durationSec);
+ virtual void setNeedsAnimate();
+ virtual void setNeedsRedraw();
+ virtual bool commitRequested() const;
+ virtual void composite();
+ virtual void updateAnimations(double frameBeginTime);
+ virtual void didStopFlinging();
+ virtual bool compositeAndReadback(void *pixels, const WebRect&);
+ virtual void finishAllRendering();
+ virtual void setDeferCommits(bool deferCommits);
+ virtual void renderingStats(WebRenderingStats&) const;
virtual void setShowFPSCounter(bool show);
virtual void setShowPaintRects(bool show);
virtual void setShowDebugBorders(bool show);
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698