| Index: content/browser/compositor/delegated_frame_host.h
|
| diff --git a/content/browser/compositor/delegated_frame_host.h b/content/browser/compositor/delegated_frame_host.h
|
| index 80cb42ac34d624d118b6dd2865b88520762d7d42..ef467fa3e086f198868efbf5b74838a8e9b2f4bb 100644
|
| --- a/content/browser/compositor/delegated_frame_host.h
|
| +++ b/content/browser/compositor/delegated_frame_host.h
|
| @@ -145,24 +145,24 @@ class CONTENT_EXPORT DelegatedFrameHost
|
| void UnlockResources();
|
|
|
| // Overridden from ui::CompositorObserver:
|
| - virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE;
|
| + virtual void OnCompositingDidCommit(ui::Compositor* compositor) override;
|
| virtual void OnCompositingStarted(ui::Compositor* compositor,
|
| - base::TimeTicks start_time) OVERRIDE;
|
| - virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE;
|
| - virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE;
|
| + base::TimeTicks start_time) override;
|
| + virtual void OnCompositingEnded(ui::Compositor* compositor) override;
|
| + virtual void OnCompositingAborted(ui::Compositor* compositor) override;
|
| virtual void OnCompositingLockStateChanged(
|
| - ui::Compositor* compositor) OVERRIDE;
|
| + ui::Compositor* compositor) override;
|
|
|
| // Overridden from ui::CompositorVSyncManager::Observer:
|
| virtual void OnUpdateVSyncParameters(base::TimeTicks timebase,
|
| - base::TimeDelta interval) OVERRIDE;
|
| + base::TimeDelta interval) override;
|
|
|
| // Overridden from ui::LayerOwnerObserver:
|
| virtual void OnLayerRecreated(ui::Layer* old_layer,
|
| - ui::Layer* new_layer) OVERRIDE;
|
| + ui::Layer* new_layer) override;
|
|
|
| // Overridden from ImageTransportFactoryObserver:
|
| - virtual void OnLostResources() OVERRIDE;
|
| + virtual void OnLostResources() override;
|
|
|
| bool ShouldSkipFrame(gfx::Size size_in_dip) const;
|
|
|
| @@ -217,14 +217,14 @@ class CONTENT_EXPORT DelegatedFrameHost
|
| void SendReturnedDelegatedResources(uint32 output_surface_id);
|
|
|
| // DelegatedFrameEvictorClient implementation.
|
| - virtual void EvictDelegatedFrame() OVERRIDE;
|
| + virtual void EvictDelegatedFrame() override;
|
|
|
| // cc::DelegatedFrameProviderClient implementation.
|
| - virtual void UnusedResourcesAreAvailable() OVERRIDE;
|
| + virtual void UnusedResourcesAreAvailable() override;
|
|
|
| // cc::SurfaceFactoryClient implementation.
|
| virtual void ReturnResources(
|
| - const cc::ReturnedResourceArray& resources) OVERRIDE;
|
| + const cc::ReturnedResourceArray& resources) override;
|
|
|
| void DidReceiveFrameFromRenderer(const gfx::Rect& damage_rect);
|
|
|
|
|