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

Side by Side Diff: ui/compositor/compositor.h

Issue 429743003: Rename Animate as Begin(Main)Frame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix a typo that made tests fail. Created 6 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_COMPOSITOR_COMPOSITOR_H_ 5 #ifndef UI_COMPOSITOR_COMPOSITOR_H_
6 #define UI_COMPOSITOR_COMPOSITOR_H_ 6 #define UI_COMPOSITOR_COMPOSITOR_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 214
215 // Signals swap has completed. 215 // Signals swap has completed.
216 void OnSwapBuffersComplete(); 216 void OnSwapBuffersComplete();
217 217
218 // Signals swap has aborted (e.g. lost context). 218 // Signals swap has aborted (e.g. lost context).
219 void OnSwapBuffersAborted(); 219 void OnSwapBuffersAborted();
220 220
221 // LayerTreeHostClient implementation. 221 // LayerTreeHostClient implementation.
222 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} 222 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {}
223 virtual void DidBeginMainFrame() OVERRIDE {} 223 virtual void DidBeginMainFrame() OVERRIDE {}
224 virtual void Animate(base::TimeTicks frame_begin_time) OVERRIDE; 224 virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE;
225 virtual void Layout() OVERRIDE; 225 virtual void Layout() OVERRIDE;
226 virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta, 226 virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta,
227 float page_scale) OVERRIDE {} 227 float page_scale) OVERRIDE {}
228 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback) 228 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback)
229 OVERRIDE; 229 OVERRIDE;
230 virtual void DidInitializeOutputSurface() OVERRIDE {} 230 virtual void DidInitializeOutputSurface() OVERRIDE {}
231 virtual void WillCommit() OVERRIDE {} 231 virtual void WillCommit() OVERRIDE {}
232 virtual void DidCommit() OVERRIDE; 232 virtual void DidCommit() OVERRIDE;
233 virtual void DidCommitAndDrawFrame() OVERRIDE; 233 virtual void DidCommitAndDrawFrame() OVERRIDE;
234 virtual void DidCompleteSwapBuffers() OVERRIDE; 234 virtual void DidCompleteSwapBuffers() OVERRIDE;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 LayerAnimatorCollection layer_animator_collection_; 306 LayerAnimatorCollection layer_animator_collection_;
307 307
308 base::WeakPtrFactory<Compositor> schedule_draw_factory_; 308 base::WeakPtrFactory<Compositor> schedule_draw_factory_;
309 309
310 DISALLOW_COPY_AND_ASSIGN(Compositor); 310 DISALLOW_COPY_AND_ASSIGN(Compositor);
311 }; 311 };
312 312
313 } // namespace ui 313 } // namespace ui
314 314
315 #endif // UI_COMPOSITOR_COMPOSITOR_H_ 315 #endif // UI_COMPOSITOR_COMPOSITOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698