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" | |
35 #include "ui/gl/gl_context.h" | 34 #include "ui/gl/gl_context.h" |
36 #include "ui/gl/gl_switches.h" | 35 #include "ui/gl/gl_switches.h" |
37 | 36 |
38 namespace { | 37 namespace { |
39 | 38 |
40 const double kDefaultRefreshRate = 60.0; | 39 const double kDefaultRefreshRate = 60.0; |
41 const double kTestRefreshRate = 200.0; | 40 const double kTestRefreshRate = 200.0; |
42 | 41 |
43 } // namespace | 42 } // namespace |
44 | 43 |
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
384 | 383 |
385 void Compositor::DidCommitAndDrawFrame() { | 384 void Compositor::DidCommitAndDrawFrame() { |
386 } | 385 } |
387 | 386 |
388 void Compositor::DidCompleteSwapBuffers() { | 387 void Compositor::DidCompleteSwapBuffers() { |
389 FOR_EACH_OBSERVER(CompositorObserver, observer_list_, | 388 FOR_EACH_OBSERVER(CompositorObserver, observer_list_, |
390 OnCompositingEnded(this)); | 389 OnCompositingEnded(this)); |
391 } | 390 } |
392 | 391 |
393 void Compositor::DidPostSwapBuffers() { | 392 void Compositor::DidPostSwapBuffers() { |
394 base::TimeTicks start_time = gfx::FrameTime::Now(); | 393 base::TimeTicks start_time = base::TimeTicks::Now(); |
395 FOR_EACH_OBSERVER(CompositorObserver, observer_list_, | 394 FOR_EACH_OBSERVER(CompositorObserver, observer_list_, |
396 OnCompositingStarted(this, start_time)); | 395 OnCompositingStarted(this, start_time)); |
397 } | 396 } |
398 | 397 |
399 void Compositor::DidAbortSwapBuffers() { | 398 void Compositor::DidAbortSwapBuffers() { |
400 FOR_EACH_OBSERVER(CompositorObserver, | 399 FOR_EACH_OBSERVER(CompositorObserver, |
401 observer_list_, | 400 observer_list_, |
402 OnCompositingAborted(this)); | 401 OnCompositingAborted(this)); |
403 } | 402 } |
404 | 403 |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
442 observer_list_, | 441 observer_list_, |
443 OnCompositingLockStateChanged(this)); | 442 OnCompositingLockStateChanged(this)); |
444 } | 443 } |
445 | 444 |
446 void Compositor::CancelCompositorLock() { | 445 void Compositor::CancelCompositorLock() { |
447 if (compositor_lock_) | 446 if (compositor_lock_) |
448 compositor_lock_->CancelLock(); | 447 compositor_lock_->CancelLock(); |
449 } | 448 } |
450 | 449 |
451 } // namespace ui | 450 } // namespace ui |
OLD | NEW |