| 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" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 } | 122 } |
| 123 renderer_capabilities_ = capabilities; | 123 renderer_capabilities_ = capabilities; |
| 124 layer_tree_host_->DidInitializeOutputSurface(); | 124 layer_tree_host_->DidInitializeOutputSurface(); |
| 125 } | 125 } |
| 126 | 126 |
| 127 void ProxyMain::DidCompletePageScaleAnimation() { | 127 void ProxyMain::DidCompletePageScaleAnimation() { |
| 128 DCHECK(IsMainThread()); | 128 DCHECK(IsMainThread()); |
| 129 layer_tree_host_->DidCompletePageScaleAnimation(); | 129 layer_tree_host_->DidCompletePageScaleAnimation(); |
| 130 } | 130 } |
| 131 | 131 |
| 132 void ProxyMain::PostFrameTimingEventsOnMain( | |
| 133 std::unique_ptr<FrameTimingTracker::CompositeTimingSet> composite_events, | |
| 134 std::unique_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events) { | |
| 135 DCHECK(IsMainThread()); | |
| 136 layer_tree_host_->RecordFrameTimingEvents(std::move(composite_events), | |
| 137 std::move(main_frame_events)); | |
| 138 } | |
| 139 | |
| 140 void ProxyMain::BeginMainFrame( | 132 void ProxyMain::BeginMainFrame( |
| 141 std::unique_ptr<BeginMainFrameAndCommitState> begin_main_frame_state) { | 133 std::unique_ptr<BeginMainFrameAndCommitState> begin_main_frame_state) { |
| 142 benchmark_instrumentation::ScopedBeginFrameTask begin_frame_task( | 134 benchmark_instrumentation::ScopedBeginFrameTask begin_frame_task( |
| 143 benchmark_instrumentation::kDoBeginFrame, | 135 benchmark_instrumentation::kDoBeginFrame, |
| 144 begin_main_frame_state->begin_frame_id); | 136 begin_main_frame_state->begin_frame_id); |
| 145 | 137 |
| 146 base::TimeTicks begin_main_frame_start_time = base::TimeTicks::Now(); | 138 base::TimeTicks begin_main_frame_start_time = base::TimeTicks::Now(); |
| 147 | 139 |
| 148 TRACE_EVENT_SYNTHETIC_DELAY_BEGIN("cc.BeginMainFrame"); | 140 TRACE_EVENT_SYNTHETIC_DELAY_BEGIN("cc.BeginMainFrame"); |
| 149 DCHECK(IsMainThread()); | 141 DCHECK(IsMainThread()); |
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 465 return false; | 457 return false; |
| 466 channel_main_->SetNeedsCommitOnImpl(); | 458 channel_main_->SetNeedsCommitOnImpl(); |
| 467 return true; | 459 return true; |
| 468 } | 460 } |
| 469 | 461 |
| 470 bool ProxyMain::IsMainThread() const { | 462 bool ProxyMain::IsMainThread() const { |
| 471 return task_runner_provider_->IsMainThread(); | 463 return task_runner_provider_->IsMainThread(); |
| 472 } | 464 } |
| 473 | 465 |
| 474 } // namespace cc | 466 } // namespace cc |
| OLD | NEW |