Commit b631ffd1 authored by jamesr@chromium.org's avatar jamesr@chromium.org

Remove OVERRIDE annotations from implementations of WebKit APIs

I'm refactoring these APIs in the WebKit repo but can't sanely stage changes to
the API without breaking these OVERRIDE annotations since the interface and
implementations are in separate repositories. The clang plugin knows to not
enforce OVERRIDE for APIs in the WebKit namespace so this won't break that.


BUG=


Review URL: https://chromiumcodereview.appspot.com/12250021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182149 0039d316-1c4b-4281-b951-d872f2087c98
parent a689854e
...@@ -423,7 +423,7 @@ class CONTENT_EXPORT RenderViewImpl ...@@ -423,7 +423,7 @@ class CONTENT_EXPORT RenderViewImpl
WebKit::WebExternalPopupMenuClient* popup_menu_client); WebKit::WebExternalPopupMenuClient* popup_menu_client);
virtual WebKit::WebStorageNamespace* createSessionStorageNamespace( virtual WebKit::WebStorageNamespace* createSessionStorageNamespace(
unsigned quota); unsigned quota);
virtual WebKit::WebCompositorOutputSurface* createOutputSurface() OVERRIDE; virtual WebKit::WebCompositorOutputSurface* createOutputSurface();
virtual void didAddMessageToConsole( virtual void didAddMessageToConsole(
const WebKit::WebConsoleMessage& message, const WebKit::WebConsoleMessage& message,
const WebKit::WebString& source_name, const WebKit::WebString& source_name,
......
...@@ -33,30 +33,30 @@ public: ...@@ -33,30 +33,30 @@ public:
WEBKIT_COMPOSITOR_BINDINGS_EXPORT cc::LayerTreeHost* layer_tree_host() const; WEBKIT_COMPOSITOR_BINDINGS_EXPORT cc::LayerTreeHost* layer_tree_host() const;
// WebLayerTreeView implementation. // WebLayerTreeView implementation.
virtual void setSurfaceReady() OVERRIDE; virtual void setSurfaceReady();
virtual void setRootLayer(const WebLayer&) OVERRIDE; virtual void setRootLayer(const WebLayer&);
virtual void clearRootLayer() OVERRIDE; virtual void clearRootLayer();
virtual void setViewportSize(const WebSize& layoutViewportSize, const WebSize& deviceViewportSize) OVERRIDE; virtual void setViewportSize(const WebSize& layoutViewportSize, const WebSize& deviceViewportSize);
virtual WebSize layoutViewportSize() const OVERRIDE; virtual WebSize layoutViewportSize() const;
virtual WebSize deviceViewportSize() const OVERRIDE; virtual WebSize deviceViewportSize() const;
virtual WebFloatPoint adjustEventPointForPinchZoom(const WebFloatPoint& point) const; // FIXME: remove this after WebKit roll. virtual WebFloatPoint adjustEventPointForPinchZoom(const WebFloatPoint& point) const; // FIXME: remove this after WebKit roll.
virtual void setDeviceScaleFactor(float) OVERRIDE; virtual void setDeviceScaleFactor(float);
virtual float deviceScaleFactor() const OVERRIDE; virtual float deviceScaleFactor() const;
virtual void setBackgroundColor(WebColor) OVERRIDE; virtual void setBackgroundColor(WebColor);
virtual void setHasTransparentBackground(bool) OVERRIDE; virtual void setHasTransparentBackground(bool);
virtual void setVisible(bool) OVERRIDE; virtual void setVisible(bool);
virtual void setPageScaleFactorAndLimits(float pageScaleFactor, float minimum, float maximum) OVERRIDE; virtual void setPageScaleFactorAndLimits(float pageScaleFactor, float minimum, float maximum);
virtual void startPageScaleAnimation(const WebPoint& destination, bool useAnchor, float newPageScale, double durationSec) OVERRIDE; virtual void startPageScaleAnimation(const WebPoint& destination, bool useAnchor, float newPageScale, double durationSec);
virtual void setNeedsAnimate() OVERRIDE; virtual void setNeedsAnimate();
virtual void setNeedsRedraw() OVERRIDE; virtual void setNeedsRedraw();
virtual bool commitRequested() const OVERRIDE; virtual bool commitRequested() const;
virtual void composite() OVERRIDE; virtual void composite();
virtual void updateAnimations(double frameBeginTime) OVERRIDE; virtual void updateAnimations(double frameBeginTime);
virtual void didStopFlinging() OVERRIDE; virtual void didStopFlinging();
virtual bool compositeAndReadback(void *pixels, const WebRect&) OVERRIDE; virtual bool compositeAndReadback(void *pixels, const WebRect&);
virtual void finishAllRendering() OVERRIDE; virtual void finishAllRendering();
virtual void setDeferCommits(bool deferCommits) OVERRIDE; virtual void setDeferCommits(bool deferCommits);
virtual void renderingStats(WebRenderingStats&) const OVERRIDE; virtual void renderingStats(WebRenderingStats&) const;
virtual void setShowFPSCounter(bool show); virtual void setShowFPSCounter(bool show);
virtual void setShowPaintRects(bool show); virtual void setShowPaintRects(bool show);
virtual void setShowDebugBorders(bool show); virtual void setShowDebugBorders(bool show);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment