| Index: android_webview/browser/hardware_renderer.h
|
| diff --git a/android_webview/browser/hardware_renderer.h b/android_webview/browser/hardware_renderer.h
|
| index 9189b18e5a120a75689114e9e820d25ef48262de..369a8ca2847fdfd1405b176c82b1c354d9a280c5 100644
|
| --- a/android_webview/browser/hardware_renderer.h
|
| +++ b/android_webview/browser/hardware_renderer.h
|
| @@ -39,30 +39,30 @@ class HardwareRenderer : public cc::LayerTreeHostClient,
|
| void CommitFrame();
|
|
|
| // cc::LayerTreeHostClient overrides.
|
| - 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 {}
|
| + 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 {}
|
|
|
| // cc::LayerTreeHostSingleThreadClient overrides.
|
| - virtual void DidPostSwapBuffers() OVERRIDE {}
|
| - virtual void DidAbortSwapBuffers() OVERRIDE {}
|
| + virtual void DidPostSwapBuffers() override {}
|
| + virtual void DidAbortSwapBuffers() override {}
|
|
|
| // cc::DelegatedFrameResourceCollectionClient overrides.
|
| - virtual void UnusedResourcesAreAvailable() OVERRIDE;
|
| + virtual void UnusedResourcesAreAvailable() override;
|
|
|
| private:
|
| void SetFrameData();
|
|
|