| 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 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 488 bool forced_draw = true; | 488 bool forced_draw = true; |
| 489 return DrawInternal(forced_draw); | 489 return DrawInternal(forced_draw); |
| 490 } | 490 } |
| 491 | 491 |
| 492 void ProxyImpl::ScheduledActionCommit() { | 492 void ProxyImpl::ScheduledActionCommit() { |
| 493 TRACE_EVENT0("cc", "ProxyImpl::ScheduledActionCommit"); | 493 TRACE_EVENT0("cc", "ProxyImpl::ScheduledActionCommit"); |
| 494 DCHECK(IsImplThread()); | 494 DCHECK(IsImplThread()); |
| 495 DCHECK(IsMainThreadBlocked()); | 495 DCHECK(IsMainThreadBlocked()); |
| 496 DCHECK(commit_completion_event_); | 496 DCHECK(commit_completion_event_); |
| 497 | 497 |
| 498 // Relax the cross-thread access restriction to non-thread-safe RefCount. | |
| 499 // It's safe since the main thread is blocked while a main-thread-bound | |
| 500 // compositor stuff are accessed from the impl thread. | |
| 501 base::ScopedAllowCrossThreadRefCountAccess | |
| 502 allow_cross_thread_ref_count_access; | |
| 503 | |
| 504 layer_tree_host_impl_->BeginCommit(); | 498 layer_tree_host_impl_->BeginCommit(); |
| 505 blocked_main_commit().layer_tree_host->FinishCommitOnImplThread( | 499 blocked_main_commit().layer_tree_host->FinishCommitOnImplThread( |
| 506 layer_tree_host_impl_.get()); | 500 layer_tree_host_impl_.get()); |
| 507 | 501 |
| 508 // Remove the LayerTreeHost reference before the completion event is signaled | 502 // Remove the LayerTreeHost reference before the completion event is signaled |
| 509 // and cleared. This is necessary since blocked_main_commit() allows access | 503 // and cleared. This is necessary since blocked_main_commit() allows access |
| 510 // only while we have the completion event to ensure the main thread is | 504 // only while we have the completion event to ensure the main thread is |
| 511 // blocked for a commit. | 505 // blocked for a commit. |
| 512 blocked_main_commit().layer_tree_host = nullptr; | 506 blocked_main_commit().layer_tree_host = nullptr; |
| 513 | 507 |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 ProxyImpl::BlockedMainCommitOnly& ProxyImpl::blocked_main_commit() { | 643 ProxyImpl::BlockedMainCommitOnly& ProxyImpl::blocked_main_commit() { |
| 650 DCHECK(IsMainThreadBlocked() && commit_completion_event_); | 644 DCHECK(IsMainThreadBlocked() && commit_completion_event_); |
| 651 return main_thread_blocked_commit_vars_unsafe_; | 645 return main_thread_blocked_commit_vars_unsafe_; |
| 652 } | 646 } |
| 653 | 647 |
| 654 base::SingleThreadTaskRunner* ProxyImpl::MainThreadTaskRunner() { | 648 base::SingleThreadTaskRunner* ProxyImpl::MainThreadTaskRunner() { |
| 655 return task_runner_provider_->MainThreadTaskRunner(); | 649 return task_runner_provider_->MainThreadTaskRunner(); |
| 656 } | 650 } |
| 657 | 651 |
| 658 } // namespace cc | 652 } // namespace cc |
| OLD | NEW |