OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "cc/trees/proxy_main.h" | 5 #include "cc/trees/proxy_main.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
11 #include "base/trace_event/trace_event_argument.h" | 11 #include "base/trace_event/trace_event_argument.h" |
12 #include "base/trace_event/trace_event_synthetic_delay.h" | 12 #include "base/trace_event/trace_event_synthetic_delay.h" |
| 13 #include "cc/animation/animation_events.h" |
13 #include "cc/debug/benchmark_instrumentation.h" | 14 #include "cc/debug/benchmark_instrumentation.h" |
14 #include "cc/debug/devtools_instrumentation.h" | 15 #include "cc/debug/devtools_instrumentation.h" |
15 #include "cc/output/output_surface.h" | 16 #include "cc/output/output_surface.h" |
16 #include "cc/output/swap_promise.h" | 17 #include "cc/output/swap_promise.h" |
17 #include "cc/trees/blocking_task_runner.h" | 18 #include "cc/trees/blocking_task_runner.h" |
18 #include "cc/trees/layer_tree_host.h" | 19 #include "cc/trees/layer_tree_host.h" |
19 #include "cc/trees/scoped_abort_remaining_swap_promises.h" | 20 #include "cc/trees/scoped_abort_remaining_swap_promises.h" |
20 #include "cc/trees/threaded_channel.h" | 21 #include "cc/trees/threaded_channel.h" |
21 | 22 |
22 namespace cc { | 23 namespace cc { |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 TRACE_EVENT0("cc", "ProxyMain::BeginMainFrameNotExpectedSoon"); | 74 TRACE_EVENT0("cc", "ProxyMain::BeginMainFrameNotExpectedSoon"); |
74 DCHECK(IsMainThread()); | 75 DCHECK(IsMainThread()); |
75 layer_tree_host_->BeginMainFrameNotExpectedSoon(); | 76 layer_tree_host_->BeginMainFrameNotExpectedSoon(); |
76 } | 77 } |
77 | 78 |
78 void ProxyMain::DidCommitAndDrawFrame() { | 79 void ProxyMain::DidCommitAndDrawFrame() { |
79 DCHECK(IsMainThread()); | 80 DCHECK(IsMainThread()); |
80 layer_tree_host_->DidCommitAndDrawFrame(); | 81 layer_tree_host_->DidCommitAndDrawFrame(); |
81 } | 82 } |
82 | 83 |
83 void ProxyMain::SetAnimationEvents(scoped_ptr<AnimationEventsVector> events) { | 84 void ProxyMain::SetAnimationEvents(scoped_ptr<AnimationEvents> events) { |
84 TRACE_EVENT0("cc", "ProxyMain::SetAnimationEvents"); | 85 TRACE_EVENT0("cc", "ProxyMain::SetAnimationEvents"); |
85 DCHECK(IsMainThread()); | 86 DCHECK(IsMainThread()); |
86 layer_tree_host_->SetAnimationEvents(std::move(events)); | 87 layer_tree_host_->SetAnimationEvents(std::move(events)); |
87 } | 88 } |
88 | 89 |
89 void ProxyMain::DidLoseOutputSurface() { | 90 void ProxyMain::DidLoseOutputSurface() { |
90 TRACE_EVENT0("cc", "ProxyMain::DidLoseOutputSurface"); | 91 TRACE_EVENT0("cc", "ProxyMain::DidLoseOutputSurface"); |
91 DCHECK(IsMainThread()); | 92 DCHECK(IsMainThread()); |
92 layer_tree_host_->DidLoseOutputSurface(); | 93 layer_tree_host_->DidLoseOutputSurface(); |
93 } | 94 } |
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
453 return false; | 454 return false; |
454 channel_main_->SetNeedsCommitOnImpl(); | 455 channel_main_->SetNeedsCommitOnImpl(); |
455 return true; | 456 return true; |
456 } | 457 } |
457 | 458 |
458 bool ProxyMain::IsMainThread() const { | 459 bool ProxyMain::IsMainThread() const { |
459 return task_runner_provider_->IsMainThread(); | 460 return task_runner_provider_->IsMainThread(); |
460 } | 461 } |
461 | 462 |
462 } // namespace cc | 463 } // namespace cc |
OLD | NEW |