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

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: Build fix. 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 209
210 // Signals swap has completed. 210 // Signals swap has completed.
211 void OnSwapBuffersComplete(); 211 void OnSwapBuffersComplete();
212 212
213 // Signals swap has aborted (e.g. lost context). 213 // Signals swap has aborted (e.g. lost context).
214 void OnSwapBuffersAborted(); 214 void OnSwapBuffersAborted();
215 215
216 // LayerTreeHostClient implementation. 216 // LayerTreeHostClient implementation.
217 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} 217 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {}
218 virtual void DidBeginMainFrame() OVERRIDE {} 218 virtual void DidBeginMainFrame() OVERRIDE {}
219 virtual void Animate(base::TimeTicks frame_begin_time) OVERRIDE; 219 virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE;
220 virtual void Layout() OVERRIDE; 220 virtual void Layout() OVERRIDE;
221 virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta, 221 virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta,
222 float page_scale) OVERRIDE {} 222 float page_scale) OVERRIDE {}
223 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback) 223 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback)
224 OVERRIDE; 224 OVERRIDE;
225 virtual void DidInitializeOutputSurface() OVERRIDE {} 225 virtual void DidInitializeOutputSurface() OVERRIDE {}
226 virtual void WillCommit() OVERRIDE {} 226 virtual void WillCommit() OVERRIDE {}
227 virtual void DidCommit() OVERRIDE; 227 virtual void DidCommit() OVERRIDE;
228 virtual void DidCommitAndDrawFrame() OVERRIDE; 228 virtual void DidCommitAndDrawFrame() OVERRIDE;
229 virtual void DidCompleteSwapBuffers() OVERRIDE; 229 virtual void DidCompleteSwapBuffers() OVERRIDE;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 CompositorLock* compositor_lock_; 282 CompositorLock* compositor_lock_;
283 283
284 LayerAnimatorCollection layer_animator_collection_; 284 LayerAnimatorCollection layer_animator_collection_;
285 285
286 DISALLOW_COPY_AND_ASSIGN(Compositor); 286 DISALLOW_COPY_AND_ASSIGN(Compositor);
287 }; 287 };
288 288
289 } // namespace ui 289 } // namespace ui
290 290
291 #endif // UI_COMPOSITOR_COMPOSITOR_H_ 291 #endif // UI_COMPOSITOR_COMPOSITOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698