Index: cc/scheduler/begin_frame_source.h |
diff --git a/cc/scheduler/begin_frame_source.h b/cc/scheduler/begin_frame_source.h |
index e0c78be1da3dc06f4e5d7839f147a4ba888023da..3b8a576c4ed9fa8363aeea15a2bdef772355234e 100644 |
--- a/cc/scheduler/begin_frame_source.h |
+++ b/cc/scheduler/begin_frame_source.h |
@@ -71,11 +71,11 @@ class CC_EXPORT BeginFrameObserverMixIn : public BeginFrameObserver { |
// Traces |args| and DCHECK |args| satisfies pre-conditions then calls |
// OnBeginFrameMixInDelegate and updates the last_begin_frame_args_ value on |
// true. |
- virtual void OnBeginFrame(const BeginFrameArgs& args) OVERRIDE; |
- virtual const BeginFrameArgs LastUsedBeginFrameArgs() const OVERRIDE; |
+ virtual void OnBeginFrame(const BeginFrameArgs& args) override; |
+ virtual const BeginFrameArgs LastUsedBeginFrameArgs() const override; |
// Outputs last_begin_frame_args_ |
- virtual void AsValueInto(base::debug::TracedValue* dict) const OVERRIDE; |
+ virtual void AsValueInto(base::debug::TracedValue* dict) const override; |
protected: |
// Subclasses should override this method! |
@@ -134,15 +134,15 @@ class CC_EXPORT BeginFrameSourceMixIn : public BeginFrameSource { |
virtual ~BeginFrameSourceMixIn() {} |
// BeginFrameSource |
- virtual bool NeedsBeginFrames() const OVERRIDE; |
- virtual void SetNeedsBeginFrames(bool needs_begin_frames) OVERRIDE; |
- virtual void DidFinishFrame(size_t remaining_frames) OVERRIDE {} |
- virtual void AddObserver(BeginFrameObserver* obs) OVERRIDE; |
- virtual void RemoveObserver(BeginFrameObserver* obs) OVERRIDE; |
+ virtual bool NeedsBeginFrames() const override; |
+ virtual void SetNeedsBeginFrames(bool needs_begin_frames) override; |
+ virtual void DidFinishFrame(size_t remaining_frames) override {} |
+ virtual void AddObserver(BeginFrameObserver* obs) override; |
+ virtual void RemoveObserver(BeginFrameObserver* obs) override; |
// Tracing support - Recommend (but not required) to call this implementation |
// in any override. |
- virtual void AsValueInto(base::debug::TracedValue* dict) const OVERRIDE; |
+ virtual void AsValueInto(base::debug::TracedValue* dict) const override; |
protected: |
BeginFrameSourceMixIn(); |
@@ -171,10 +171,10 @@ class CC_EXPORT BackToBackBeginFrameSource : public BeginFrameSourceMixIn { |
virtual ~BackToBackBeginFrameSource(); |
// BeginFrameSource |
- virtual void DidFinishFrame(size_t remaining_frames) OVERRIDE; |
+ virtual void DidFinishFrame(size_t remaining_frames) override; |
// Tracing |
- virtual void AsValueInto(base::debug::TracedValue* dict) const OVERRIDE; |
+ virtual void AsValueInto(base::debug::TracedValue* dict) const override; |
protected: |
explicit BackToBackBeginFrameSource( |
@@ -187,7 +187,7 @@ class CC_EXPORT BackToBackBeginFrameSource : public BeginFrameSourceMixIn { |
bool send_begin_frame_posted_; |
// BeginFrameSourceMixIn |
- virtual void OnNeedsBeginFramesChange(bool needs_begin_frames) OVERRIDE; |
+ virtual void OnNeedsBeginFramesChange(bool needs_begin_frames) override; |
void BeginFrame(); |
}; |
@@ -205,18 +205,18 @@ class CC_EXPORT SyntheticBeginFrameSource : public BeginFrameSourceMixIn, |
virtual ~SyntheticBeginFrameSource(); |
// BeginFrameSource |
- virtual bool NeedsBeginFrames() const OVERRIDE; |
+ virtual bool NeedsBeginFrames() const override; |
// Tracing |
- virtual void AsValueInto(base::debug::TracedValue* dict) const OVERRIDE; |
+ virtual void AsValueInto(base::debug::TracedValue* dict) const override; |
// VSyncParameterObserver |
virtual void OnUpdateVSyncParameters( |
base::TimeTicks new_vsync_timebase, |
- base::TimeDelta new_vsync_interval) OVERRIDE; |
+ base::TimeDelta new_vsync_interval) override; |
// TimeSourceClient |
- virtual void OnTimerTick() OVERRIDE; |
+ virtual void OnTimerTick() override; |
protected: |
explicit SyntheticBeginFrameSource( |
@@ -226,7 +226,7 @@ class CC_EXPORT SyntheticBeginFrameSource : public BeginFrameSourceMixIn, |
BeginFrameArgs::BeginFrameArgsType type); |
// BeginFrameSourceMixIn |
- virtual void OnNeedsBeginFramesChange(bool needs_begin_frames) OVERRIDE; |
+ virtual void OnNeedsBeginFramesChange(bool needs_begin_frames) override; |
scoped_refptr<DelayBasedTimeSource> time_source_; |
}; |
@@ -251,16 +251,16 @@ class CC_EXPORT BeginFrameSourceMultiplexer : public BeginFrameSourceMixIn, |
// The mux is an BeginFrameObserver as it needs to proxy the OnBeginFrame |
// calls to preserve the monotonicity of the BeginFrameArgs when switching |
// sources. |
- virtual void OnBeginFrame(const BeginFrameArgs& args) OVERRIDE; |
- virtual const BeginFrameArgs LastUsedBeginFrameArgs() const OVERRIDE; |
+ virtual void OnBeginFrame(const BeginFrameArgs& args) override; |
+ virtual const BeginFrameArgs LastUsedBeginFrameArgs() const override; |
// BeginFrameSource |
- virtual bool NeedsBeginFrames() const OVERRIDE; |
- virtual void SetNeedsBeginFrames(bool needs_begin_frames) OVERRIDE; |
- virtual void DidFinishFrame(size_t remaining_frames) OVERRIDE; |
+ virtual bool NeedsBeginFrames() const override; |
+ virtual void SetNeedsBeginFrames(bool needs_begin_frames) override; |
+ virtual void DidFinishFrame(size_t remaining_frames) override; |
// Tracing |
- virtual void AsValueInto(base::debug::TracedValue* dict) const OVERRIDE; |
+ virtual void AsValueInto(base::debug::TracedValue* dict) const override; |
protected: |
BeginFrameSourceMultiplexer(); |