| 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_impl.h" | 5 #include "cc/trees/proxy_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 459 benchmark_instrumentation::ScopedBeginFrameTask begin_frame_task( | 459 benchmark_instrumentation::ScopedBeginFrameTask begin_frame_task( |
| 460 benchmark_instrumentation::kSendBeginFrame, begin_frame_id); | 460 benchmark_instrumentation::kSendBeginFrame, begin_frame_id); |
| 461 std::unique_ptr<BeginMainFrameAndCommitState> begin_main_frame_state( | 461 std::unique_ptr<BeginMainFrameAndCommitState> begin_main_frame_state( |
| 462 new BeginMainFrameAndCommitState); | 462 new BeginMainFrameAndCommitState); |
| 463 begin_main_frame_state->begin_frame_id = begin_frame_id; | 463 begin_main_frame_state->begin_frame_id = begin_frame_id; |
| 464 begin_main_frame_state->begin_frame_args = args; | 464 begin_main_frame_state->begin_frame_args = args; |
| 465 begin_main_frame_state->begin_frame_callbacks = | 465 begin_main_frame_state->begin_frame_callbacks = |
| 466 layer_tree_host_impl_->ProcessLayerTreeMutations(); | 466 layer_tree_host_impl_->ProcessLayerTreeMutations(); |
| 467 begin_main_frame_state->scroll_info = | 467 begin_main_frame_state->scroll_info = |
| 468 layer_tree_host_impl_->ProcessScrollDeltas(); | 468 layer_tree_host_impl_->ProcessScrollDeltas(); |
| 469 begin_main_frame_state->memory_allocation_limit_bytes = | |
| 470 layer_tree_host_impl_->memory_allocation_limit_bytes(); | |
| 471 begin_main_frame_state->evicted_ui_resources = | 469 begin_main_frame_state->evicted_ui_resources = |
| 472 layer_tree_host_impl_->EvictedUIResourcesExist(); | 470 layer_tree_host_impl_->EvictedUIResourcesExist(); |
| 473 channel_impl_->BeginMainFrame(std::move(begin_main_frame_state)); | 471 channel_impl_->BeginMainFrame(std::move(begin_main_frame_state)); |
| 474 devtools_instrumentation::DidRequestMainThreadFrame(layer_tree_host_id_); | 472 devtools_instrumentation::DidRequestMainThreadFrame(layer_tree_host_id_); |
| 475 } | 473 } |
| 476 | 474 |
| 477 DrawResult ProxyImpl::ScheduledActionDrawAndSwapIfPossible() { | 475 DrawResult ProxyImpl::ScheduledActionDrawAndSwapIfPossible() { |
| 478 TRACE_EVENT0("cc", "ProxyImpl::ScheduledActionDrawAndSwap"); | 476 TRACE_EVENT0("cc", "ProxyImpl::ScheduledActionDrawAndSwap"); |
| 479 DCHECK(IsImplThread()); | 477 DCHECK(IsImplThread()); |
| 480 | 478 |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 629 bool ProxyImpl::IsMainThreadBlocked() const { | 627 bool ProxyImpl::IsMainThreadBlocked() const { |
| 630 return task_runner_provider_->IsMainThreadBlocked(); | 628 return task_runner_provider_->IsMainThreadBlocked(); |
| 631 } | 629 } |
| 632 | 630 |
| 633 ProxyImpl::BlockedMainCommitOnly& ProxyImpl::blocked_main_commit() { | 631 ProxyImpl::BlockedMainCommitOnly& ProxyImpl::blocked_main_commit() { |
| 634 DCHECK(IsMainThreadBlocked() && commit_completion_event_); | 632 DCHECK(IsMainThreadBlocked() && commit_completion_event_); |
| 635 return main_thread_blocked_commit_vars_unsafe_; | 633 return main_thread_blocked_commit_vars_unsafe_; |
| 636 } | 634 } |
| 637 | 635 |
| 638 } // namespace cc | 636 } // namespace cc |
| OLD | NEW |