Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(447)

Side by Side Diff: cc/trees/thread_proxy.h

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/trees/single_thread_proxy.h ('k') | cc/trees/tree_synchronizer_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_TREES_THREAD_PROXY_H_ 5 #ifndef CC_TREES_THREAD_PROXY_H_
6 #define CC_TREES_THREAD_PROXY_H_ 6 #define CC_TREES_THREAD_PROXY_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 143
144 scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl; 144 scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl;
145 base::WeakPtrFactory<ThreadProxy> weak_factory; 145 base::WeakPtrFactory<ThreadProxy> weak_factory;
146 }; 146 };
147 147
148 const MainThreadOnly& main() const; 148 const MainThreadOnly& main() const;
149 const MainThreadOrBlockedMainThread& blocked_main() const; 149 const MainThreadOrBlockedMainThread& blocked_main() const;
150 const CompositorThreadOnly& impl() const; 150 const CompositorThreadOnly& impl() const;
151 151
152 // Proxy implementation 152 // Proxy implementation
153 virtual void FinishAllRendering() OVERRIDE; 153 virtual void FinishAllRendering() override;
154 virtual bool IsStarted() const OVERRIDE; 154 virtual bool IsStarted() const override;
155 virtual void SetOutputSurface(scoped_ptr<OutputSurface>) OVERRIDE; 155 virtual void SetOutputSurface(scoped_ptr<OutputSurface>) override;
156 virtual void SetLayerTreeHostClientReady() OVERRIDE; 156 virtual void SetLayerTreeHostClientReady() override;
157 virtual void SetVisible(bool visible) OVERRIDE; 157 virtual void SetVisible(bool visible) override;
158 virtual const RendererCapabilities& GetRendererCapabilities() const OVERRIDE; 158 virtual const RendererCapabilities& GetRendererCapabilities() const override;
159 virtual void SetNeedsAnimate() OVERRIDE; 159 virtual void SetNeedsAnimate() override;
160 virtual void SetNeedsUpdateLayers() OVERRIDE; 160 virtual void SetNeedsUpdateLayers() override;
161 virtual void SetNeedsCommit() OVERRIDE; 161 virtual void SetNeedsCommit() override;
162 virtual void SetNeedsRedraw(const gfx::Rect& damage_rect) OVERRIDE; 162 virtual void SetNeedsRedraw(const gfx::Rect& damage_rect) override;
163 virtual void SetNextCommitWaitsForActivation() OVERRIDE; 163 virtual void SetNextCommitWaitsForActivation() override;
164 virtual void NotifyInputThrottledUntilCommit() OVERRIDE; 164 virtual void NotifyInputThrottledUntilCommit() override;
165 virtual void SetDeferCommits(bool defer_commits) OVERRIDE; 165 virtual void SetDeferCommits(bool defer_commits) override;
166 virtual bool CommitRequested() const OVERRIDE; 166 virtual bool CommitRequested() const override;
167 virtual bool BeginMainFrameRequested() const OVERRIDE; 167 virtual bool BeginMainFrameRequested() const override;
168 virtual void MainThreadHasStoppedFlinging() OVERRIDE; 168 virtual void MainThreadHasStoppedFlinging() override;
169 virtual void Start() OVERRIDE; 169 virtual void Start() override;
170 virtual void Stop() OVERRIDE; 170 virtual void Stop() override;
171 virtual size_t MaxPartialTextureUpdates() const OVERRIDE; 171 virtual size_t MaxPartialTextureUpdates() const override;
172 virtual void ForceSerializeOnSwapBuffers() OVERRIDE; 172 virtual void ForceSerializeOnSwapBuffers() override;
173 virtual bool SupportsImplScrolling() const OVERRIDE; 173 virtual bool SupportsImplScrolling() const override;
174 virtual void SetDebugState(const LayerTreeDebugState& debug_state) OVERRIDE; 174 virtual void SetDebugState(const LayerTreeDebugState& debug_state) override;
175 virtual void AsValueInto(base::debug::TracedValue* value) const OVERRIDE; 175 virtual void AsValueInto(base::debug::TracedValue* value) const override;
176 virtual bool MainFrameWillHappenForTesting() OVERRIDE; 176 virtual bool MainFrameWillHappenForTesting() override;
177 177
178 // LayerTreeHostImplClient implementation 178 // LayerTreeHostImplClient implementation
179 virtual void UpdateRendererCapabilitiesOnImplThread() OVERRIDE; 179 virtual void UpdateRendererCapabilitiesOnImplThread() override;
180 virtual void DidLoseOutputSurfaceOnImplThread() OVERRIDE; 180 virtual void DidLoseOutputSurfaceOnImplThread() override;
181 virtual void CommitVSyncParameters(base::TimeTicks timebase, 181 virtual void CommitVSyncParameters(base::TimeTicks timebase,
182 base::TimeDelta interval) OVERRIDE; 182 base::TimeDelta interval) override;
183 virtual void SetEstimatedParentDrawTime(base::TimeDelta draw_time) OVERRIDE; 183 virtual void SetEstimatedParentDrawTime(base::TimeDelta draw_time) override;
184 virtual void SetMaxSwapsPendingOnImplThread(int max) OVERRIDE; 184 virtual void SetMaxSwapsPendingOnImplThread(int max) override;
185 virtual void DidSwapBuffersOnImplThread() OVERRIDE; 185 virtual void DidSwapBuffersOnImplThread() override;
186 virtual void DidSwapBuffersCompleteOnImplThread() OVERRIDE; 186 virtual void DidSwapBuffersCompleteOnImplThread() override;
187 virtual void OnCanDrawStateChanged(bool can_draw) OVERRIDE; 187 virtual void OnCanDrawStateChanged(bool can_draw) override;
188 virtual void NotifyReadyToActivate() OVERRIDE; 188 virtual void NotifyReadyToActivate() override;
189 // Please call these 3 functions through 189 // Please call these 3 functions through
190 // LayerTreeHostImpl's SetNeedsRedraw(), SetNeedsRedrawRect() and 190 // LayerTreeHostImpl's SetNeedsRedraw(), SetNeedsRedrawRect() and
191 // SetNeedsAnimate(). 191 // SetNeedsAnimate().
192 virtual void SetNeedsRedrawOnImplThread() OVERRIDE; 192 virtual void SetNeedsRedrawOnImplThread() override;
193 virtual void SetNeedsRedrawRectOnImplThread(const gfx::Rect& dirty_rect) 193 virtual void SetNeedsRedrawRectOnImplThread(const gfx::Rect& dirty_rect)
194 OVERRIDE; 194 override;
195 virtual void SetNeedsAnimateOnImplThread() OVERRIDE; 195 virtual void SetNeedsAnimateOnImplThread() override;
196 virtual void SetNeedsManageTilesOnImplThread() OVERRIDE; 196 virtual void SetNeedsManageTilesOnImplThread() override;
197 virtual void DidInitializeVisibleTileOnImplThread() OVERRIDE; 197 virtual void DidInitializeVisibleTileOnImplThread() override;
198 virtual void SetNeedsCommitOnImplThread() OVERRIDE; 198 virtual void SetNeedsCommitOnImplThread() override;
199 virtual void PostAnimationEventsToMainThreadOnImplThread( 199 virtual void PostAnimationEventsToMainThreadOnImplThread(
200 scoped_ptr<AnimationEventsVector> queue) OVERRIDE; 200 scoped_ptr<AnimationEventsVector> queue) override;
201 virtual bool ReduceContentsTextureMemoryOnImplThread(size_t limit_bytes, 201 virtual bool ReduceContentsTextureMemoryOnImplThread(size_t limit_bytes,
202 int priority_cutoff) 202 int priority_cutoff)
203 OVERRIDE; 203 override;
204 virtual bool IsInsideDraw() OVERRIDE; 204 virtual bool IsInsideDraw() override;
205 virtual void RenewTreePriority() OVERRIDE; 205 virtual void RenewTreePriority() override;
206 virtual void PostDelayedScrollbarFadeOnImplThread( 206 virtual void PostDelayedScrollbarFadeOnImplThread(
207 const base::Closure& start_fade, 207 const base::Closure& start_fade,
208 base::TimeDelta delay) OVERRIDE; 208 base::TimeDelta delay) override;
209 virtual void DidActivateSyncTree() OVERRIDE; 209 virtual void DidActivateSyncTree() override;
210 virtual void DidManageTiles() OVERRIDE; 210 virtual void DidManageTiles() override;
211 211
212 // SchedulerClient implementation 212 // SchedulerClient implementation
213 virtual BeginFrameSource* ExternalBeginFrameSource() OVERRIDE; 213 virtual BeginFrameSource* ExternalBeginFrameSource() override;
214 virtual void WillBeginImplFrame(const BeginFrameArgs& args) OVERRIDE; 214 virtual void WillBeginImplFrame(const BeginFrameArgs& args) override;
215 virtual void ScheduledActionSendBeginMainFrame() OVERRIDE; 215 virtual void ScheduledActionSendBeginMainFrame() override;
216 virtual DrawResult ScheduledActionDrawAndSwapIfPossible() OVERRIDE; 216 virtual DrawResult ScheduledActionDrawAndSwapIfPossible() override;
217 virtual DrawResult ScheduledActionDrawAndSwapForced() OVERRIDE; 217 virtual DrawResult ScheduledActionDrawAndSwapForced() override;
218 virtual void ScheduledActionAnimate() OVERRIDE; 218 virtual void ScheduledActionAnimate() override;
219 virtual void ScheduledActionCommit() OVERRIDE; 219 virtual void ScheduledActionCommit() override;
220 virtual void ScheduledActionUpdateVisibleTiles() OVERRIDE; 220 virtual void ScheduledActionUpdateVisibleTiles() override;
221 virtual void ScheduledActionActivateSyncTree() OVERRIDE; 221 virtual void ScheduledActionActivateSyncTree() override;
222 virtual void ScheduledActionBeginOutputSurfaceCreation() OVERRIDE; 222 virtual void ScheduledActionBeginOutputSurfaceCreation() override;
223 virtual void ScheduledActionManageTiles() OVERRIDE; 223 virtual void ScheduledActionManageTiles() override;
224 virtual void DidAnticipatedDrawTimeChange(base::TimeTicks time) OVERRIDE; 224 virtual void DidAnticipatedDrawTimeChange(base::TimeTicks time) override;
225 virtual base::TimeDelta DrawDurationEstimate() OVERRIDE; 225 virtual base::TimeDelta DrawDurationEstimate() override;
226 virtual base::TimeDelta BeginMainFrameToCommitDurationEstimate() OVERRIDE; 226 virtual base::TimeDelta BeginMainFrameToCommitDurationEstimate() override;
227 virtual base::TimeDelta CommitToActivateDurationEstimate() OVERRIDE; 227 virtual base::TimeDelta CommitToActivateDurationEstimate() override;
228 virtual void DidBeginImplFrameDeadline() OVERRIDE; 228 virtual void DidBeginImplFrameDeadline() override;
229 229
230 // ResourceUpdateControllerClient implementation 230 // ResourceUpdateControllerClient implementation
231 virtual void ReadyToFinalizeTextureUpdates() OVERRIDE; 231 virtual void ReadyToFinalizeTextureUpdates() override;
232 232
233 protected: 233 protected:
234 ThreadProxy(LayerTreeHost* layer_tree_host, 234 ThreadProxy(LayerTreeHost* layer_tree_host,
235 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, 235 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
236 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner); 236 scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
237 237
238 private: 238 private:
239 // Called on main thread. 239 // Called on main thread.
240 void SetRendererCapabilitiesMainThreadCopy( 240 void SetRendererCapabilitiesMainThreadCopy(
241 const RendererCapabilities& capabilities); 241 const RendererCapabilities& capabilities);
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 297
298 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; 298 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_;
299 base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_; 299 base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_;
300 300
301 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); 301 DISALLOW_COPY_AND_ASSIGN(ThreadProxy);
302 }; 302 };
303 303
304 } // namespace cc 304 } // namespace cc
305 305
306 #endif // CC_TREES_THREAD_PROXY_H_ 306 #endif // CC_TREES_THREAD_PROXY_H_
OLDNEW
« no previous file with comments | « cc/trees/single_thread_proxy.h ('k') | cc/trees/tree_synchronizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698