| 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 #ifndef CC_TREES_PROXY_IMPL_H_ | 5 #ifndef CC_TREES_PROXY_IMPL_H_ |
| 6 #define CC_TREES_PROXY_IMPL_H_ | 6 #define CC_TREES_PROXY_IMPL_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 void ReleaseCompositorFrameSinkOnImpl(CompletionEvent* completion); | 49 void ReleaseCompositorFrameSinkOnImpl(CompletionEvent* completion); |
| 50 void FinishGLOnImpl(CompletionEvent* completion); | 50 void FinishGLOnImpl(CompletionEvent* completion); |
| 51 void NotifyReadyToCommitOnImpl(CompletionEvent* completion, | 51 void NotifyReadyToCommitOnImpl(CompletionEvent* completion, |
| 52 LayerTreeHost* layer_tree_host, | 52 LayerTreeHost* layer_tree_host, |
| 53 base::TimeTicks main_thread_start_time, | 53 base::TimeTicks main_thread_start_time, |
| 54 bool hold_commit_for_activation); | 54 bool hold_commit_for_activation); |
| 55 | 55 |
| 56 void MainFrameWillHappenOnImplForTesting(CompletionEvent* completion, | 56 void MainFrameWillHappenOnImplForTesting(CompletionEvent* completion, |
| 57 bool* main_frame_will_happen); | 57 bool* main_frame_will_happen); |
| 58 | 58 |
| 59 NOINLINE void DumpForBeginMainFrameHang(); |
| 60 |
| 59 private: | 61 private: |
| 60 // The members of this struct should be accessed on the impl thread only when | 62 // The members of this struct should be accessed on the impl thread only when |
| 61 // the main thread is blocked for a commit. | 63 // the main thread is blocked for a commit. |
| 62 struct BlockedMainCommitOnly { | 64 struct BlockedMainCommitOnly { |
| 63 BlockedMainCommitOnly(); | 65 BlockedMainCommitOnly(); |
| 64 ~BlockedMainCommitOnly(); | 66 ~BlockedMainCommitOnly(); |
| 65 LayerTreeHost* layer_tree_host; | 67 LayerTreeHost* layer_tree_host; |
| 66 }; | 68 }; |
| 67 | 69 |
| 68 // LayerTreeHostImplClient implementation | 70 // LayerTreeHostImplClient implementation |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 | 148 |
| 147 // Used to post tasks to ProxyMain on the main thread. | 149 // Used to post tasks to ProxyMain on the main thread. |
| 148 base::WeakPtr<ProxyMain> proxy_main_weak_ptr_; | 150 base::WeakPtr<ProxyMain> proxy_main_weak_ptr_; |
| 149 | 151 |
| 150 DISALLOW_COPY_AND_ASSIGN(ProxyImpl); | 152 DISALLOW_COPY_AND_ASSIGN(ProxyImpl); |
| 151 }; | 153 }; |
| 152 | 154 |
| 153 } // namespace cc | 155 } // namespace cc |
| 154 | 156 |
| 155 #endif // CC_TREES_PROXY_IMPL_H_ | 157 #endif // CC_TREES_PROXY_IMPL_H_ |
| OLD | NEW |