Index: content/renderer/gpu/render_widget_compositor.h |
diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h |
index 88367b329ff8d3912deae28bc4675039bc772a91..044c9532bb0350313b65d7d642ef3714c8bce549 100644 |
--- a/content/renderer/gpu/render_widget_compositor.h |
+++ b/content/renderer/gpu/render_widget_compositor.h |
@@ -116,11 +116,11 @@ class CONTENT_EXPORT RenderWidgetCompositor |
virtual void registerViewportLayers( |
const blink::WebLayer* pageScaleLayer, |
const blink::WebLayer* innerViewportScrollLayer, |
- const blink::WebLayer* outerViewportScrollLayer) OVERRIDE; |
- virtual void clearViewportLayers() OVERRIDE; |
+ const blink::WebLayer* outerViewportScrollLayer) override; |
+ virtual void clearViewportLayers() override; |
virtual void registerSelection(const blink::WebSelectionBound& start, |
- const blink::WebSelectionBound& end) OVERRIDE; |
- virtual void clearSelection() OVERRIDE; |
+ const blink::WebSelectionBound& end) override; |
+ virtual void clearSelection() override; |
virtual void setShowFPSCounter(bool show); |
virtual void setShowPaintRects(bool show); |
virtual void setShowDebugBorders(bool show); |
@@ -129,29 +129,29 @@ class CONTENT_EXPORT RenderWidgetCompositor |
virtual void setTopControlsContentOffset(float); |
// cc::LayerTreeHostClient implementation. |
- virtual void WillBeginMainFrame(int frame_id) OVERRIDE; |
- virtual void DidBeginMainFrame() OVERRIDE; |
- virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE; |
- virtual void Layout() OVERRIDE; |
+ virtual void WillBeginMainFrame(int frame_id) override; |
+ virtual void DidBeginMainFrame() override; |
+ virtual void BeginMainFrame(const cc::BeginFrameArgs& args) override; |
+ virtual void Layout() override; |
virtual void ApplyViewportDeltas(const gfx::Vector2d& inner_delta, |
const gfx::Vector2d& outer_delta, |
float page_scale, |
- float top_controls_delta) OVERRIDE; |
+ float top_controls_delta) override; |
virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, |
float page_scale, |
- float top_controls_delta) OVERRIDE; |
- virtual void RequestNewOutputSurface(bool fallback) OVERRIDE; |
- virtual void DidInitializeOutputSurface() OVERRIDE; |
- virtual void WillCommit() OVERRIDE; |
- virtual void DidCommit() OVERRIDE; |
- virtual void DidCommitAndDrawFrame() OVERRIDE; |
- virtual void DidCompleteSwapBuffers() OVERRIDE; |
- virtual void RateLimitSharedMainThreadContext() OVERRIDE; |
+ float top_controls_delta) override; |
+ virtual void RequestNewOutputSurface(bool fallback) override; |
+ virtual void DidInitializeOutputSurface() override; |
+ virtual void WillCommit() override; |
+ virtual void DidCommit() override; |
+ virtual void DidCommitAndDrawFrame() override; |
+ virtual void DidCompleteSwapBuffers() override; |
+ virtual void RateLimitSharedMainThreadContext() override; |
// cc::LayerTreeHostSingleThreadClient implementation. |
- virtual void ScheduleAnimation() OVERRIDE; |
- virtual void DidPostSwapBuffers() OVERRIDE; |
- virtual void DidAbortSwapBuffers() OVERRIDE; |
+ virtual void ScheduleAnimation() override; |
+ virtual void DidPostSwapBuffers() override; |
+ virtual void DidAbortSwapBuffers() override; |
private: |
RenderWidgetCompositor(RenderWidget* widget, bool threaded); |