OLD | NEW |
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 #include "ui/compositor/compositor.h" | 5 #include "ui/compositor/compositor.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <deque> | 8 #include <deque> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "cc/scheduler/begin_frame_source.h" | 24 #include "cc/scheduler/begin_frame_source.h" |
25 #include "cc/surfaces/surface_id_allocator.h" | 25 #include "cc/surfaces/surface_id_allocator.h" |
26 #include "cc/trees/layer_tree_host.h" | 26 #include "cc/trees/layer_tree_host.h" |
27 #include "third_party/skia/include/core/SkBitmap.h" | 27 #include "third_party/skia/include/core/SkBitmap.h" |
28 #include "ui/compositor/compositor_observer.h" | 28 #include "ui/compositor/compositor_observer.h" |
29 #include "ui/compositor/compositor_switches.h" | 29 #include "ui/compositor/compositor_switches.h" |
30 #include "ui/compositor/compositor_vsync_manager.h" | 30 #include "ui/compositor/compositor_vsync_manager.h" |
31 #include "ui/compositor/dip_util.h" | 31 #include "ui/compositor/dip_util.h" |
32 #include "ui/compositor/layer.h" | 32 #include "ui/compositor/layer.h" |
33 #include "ui/compositor/layer_animator_collection.h" | 33 #include "ui/compositor/layer_animator_collection.h" |
34 #include "ui/gfx/frame_time.h" | 34 |
35 #include "ui/gl/gl_context.h" | 35 #include "ui/gl/gl_context.h" |
36 #include "ui/gl/gl_switches.h" | 36 #include "ui/gl/gl_switches.h" |
37 | 37 |
38 namespace { | 38 namespace { |
39 | 39 |
40 const double kDefaultRefreshRate = 60.0; | 40 const double kDefaultRefreshRate = 60.0; |
41 const double kTestRefreshRate = 200.0; | 41 const double kTestRefreshRate = 200.0; |
42 | 42 |
43 } // namespace | 43 } // namespace |
44 | 44 |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
373 | 373 |
374 void Compositor::DidCommitAndDrawFrame() { | 374 void Compositor::DidCommitAndDrawFrame() { |
375 } | 375 } |
376 | 376 |
377 void Compositor::DidCompleteSwapBuffers() { | 377 void Compositor::DidCompleteSwapBuffers() { |
378 FOR_EACH_OBSERVER(CompositorObserver, observer_list_, | 378 FOR_EACH_OBSERVER(CompositorObserver, observer_list_, |
379 OnCompositingEnded(this)); | 379 OnCompositingEnded(this)); |
380 } | 380 } |
381 | 381 |
382 void Compositor::DidPostSwapBuffers() { | 382 void Compositor::DidPostSwapBuffers() { |
383 base::TimeTicks start_time = gfx::FrameTime::Now(); | 383 base::TimeTicks start_time = base::TimeTicks::Now(); |
384 FOR_EACH_OBSERVER(CompositorObserver, observer_list_, | 384 FOR_EACH_OBSERVER(CompositorObserver, observer_list_, |
385 OnCompositingStarted(this, start_time)); | 385 OnCompositingStarted(this, start_time)); |
386 } | 386 } |
387 | 387 |
388 void Compositor::DidAbortSwapBuffers() { | 388 void Compositor::DidAbortSwapBuffers() { |
389 FOR_EACH_OBSERVER(CompositorObserver, | 389 FOR_EACH_OBSERVER(CompositorObserver, |
390 observer_list_, | 390 observer_list_, |
391 OnCompositingAborted(this)); | 391 OnCompositingAborted(this)); |
392 } | 392 } |
393 | 393 |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
431 observer_list_, | 431 observer_list_, |
432 OnCompositingLockStateChanged(this)); | 432 OnCompositingLockStateChanged(this)); |
433 } | 433 } |
434 | 434 |
435 void Compositor::CancelCompositorLock() { | 435 void Compositor::CancelCompositorLock() { |
436 if (compositor_lock_) | 436 if (compositor_lock_) |
437 compositor_lock_->CancelLock(); | 437 compositor_lock_->CancelLock(); |
438 } | 438 } |
439 | 439 |
440 } // namespace ui | 440 } // namespace ui |
OLD | NEW |