| 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 616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 627 | 627 |
| 628 ProxyImpl::BlockedMainCommitOnly& ProxyImpl::blocked_main_commit() { | 628 ProxyImpl::BlockedMainCommitOnly& ProxyImpl::blocked_main_commit() { |
| 629 DCHECK(IsMainThreadBlocked() && commit_completion_event_); | 629 DCHECK(IsMainThreadBlocked() && commit_completion_event_); |
| 630 return main_thread_blocked_commit_vars_unsafe_; | 630 return main_thread_blocked_commit_vars_unsafe_; |
| 631 } | 631 } |
| 632 | 632 |
| 633 base::SingleThreadTaskRunner* ProxyImpl::MainThreadTaskRunner() { | 633 base::SingleThreadTaskRunner* ProxyImpl::MainThreadTaskRunner() { |
| 634 return task_runner_provider_->MainThreadTaskRunner(); | 634 return task_runner_provider_->MainThreadTaskRunner(); |
| 635 } | 635 } |
| 636 | 636 |
| 637 void ProxyImpl::ResetTrees() { |
| 638 layer_tree_host_impl_->ResetTrees(); |
| 639 } |
| 640 |
| 637 } // namespace cc | 641 } // namespace cc |
| OLD | NEW |