OLD | NEW |
---|---|
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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_SINGLE_THREAD_PROXY_H_ | 5 #ifndef CC_TREES_SINGLE_THREAD_PROXY_H_ |
6 #define CC_TREES_SINGLE_THREAD_PROXY_H_ | 6 #define CC_TREES_SINGLE_THREAD_PROXY_H_ |
7 | 7 |
8 #include <limits> | 8 #include <limits> |
9 | 9 |
10 #include "base/time.h" | 10 #include "base/time.h" |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
100 // Used on the Thread, but checked on main thread during | 100 // Used on the Thread, but checked on main thread during |
101 // initialization/shutdown. | 101 // initialization/shutdown. |
102 scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl_; | 102 scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl_; |
103 bool renderer_initialized_; | 103 bool renderer_initialized_; |
104 RendererCapabilities renderer_capabilities_for_main_thread_; | 104 RendererCapabilities renderer_capabilities_for_main_thread_; |
105 | 105 |
106 bool next_frame_is_newly_committed_frame_; | 106 bool next_frame_is_newly_committed_frame_; |
107 | 107 |
108 bool inside_draw_; | 108 bool inside_draw_; |
109 | 109 |
110 base::TimeDelta total_commit_time_; | |
egraether
2013/03/23 00:15:40
Forgot to remove these as well.
| |
111 size_t total_commit_count_; | |
112 | |
113 DISALLOW_COPY_AND_ASSIGN(SingleThreadProxy); | 110 DISALLOW_COPY_AND_ASSIGN(SingleThreadProxy); |
114 }; | 111 }; |
115 | 112 |
116 // For use in the single-threaded case. In debug builds, it pretends that the | 113 // For use in the single-threaded case. In debug builds, it pretends that the |
117 // code is running on the impl thread to satisfy assertion checks. | 114 // code is running on the impl thread to satisfy assertion checks. |
118 class DebugScopedSetImplThread { | 115 class DebugScopedSetImplThread { |
119 public: | 116 public: |
120 explicit DebugScopedSetImplThread(Proxy* proxy) : proxy_(proxy) { | 117 explicit DebugScopedSetImplThread(Proxy* proxy) : proxy_(proxy) { |
121 #ifndef NDEBUG | 118 #ifndef NDEBUG |
122 previous_value_ = proxy_->impl_thread_is_overridden_; | 119 previous_value_ = proxy_->impl_thread_is_overridden_; |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
170 private: | 167 private: |
171 DebugScopedSetImplThread impl_thread_; | 168 DebugScopedSetImplThread impl_thread_; |
172 DebugScopedSetMainThreadBlocked main_thread_blocked_; | 169 DebugScopedSetMainThreadBlocked main_thread_blocked_; |
173 | 170 |
174 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked); | 171 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked); |
175 }; | 172 }; |
176 | 173 |
177 } // namespace cc | 174 } // namespace cc |
178 | 175 |
179 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_ | 176 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_ |
OLD | NEW |