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_THREAD_PROXY_H_ | 5 #ifndef CC_TREES_THREAD_PROXY_H_ |
6 #define CC_TREES_THREAD_PROXY_H_ | 6 #define CC_TREES_THREAD_PROXY_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 base::WeakPtrFactory<ThreadProxy> weak_factory; | 146 base::WeakPtrFactory<ThreadProxy> weak_factory; |
147 }; | 147 }; |
148 | 148 |
149 const MainThreadOnly& main() const; | 149 const MainThreadOnly& main() const; |
150 const MainThreadOrBlockedMainThread& blocked_main() const; | 150 const MainThreadOrBlockedMainThread& blocked_main() const; |
151 const CompositorThreadOnly& impl() const; | 151 const CompositorThreadOnly& impl() const; |
152 | 152 |
153 // Proxy implementation | 153 // Proxy implementation |
154 void FinishAllRendering() override; | 154 void FinishAllRendering() override; |
155 bool IsStarted() const override; | 155 bool IsStarted() const override; |
| 156 bool CommitToActiveTree() const override; |
156 void SetOutputSurface(scoped_ptr<OutputSurface>) override; | 157 void SetOutputSurface(scoped_ptr<OutputSurface>) override; |
157 void SetLayerTreeHostClientReady() override; | 158 void SetLayerTreeHostClientReady() override; |
158 void SetVisible(bool visible) override; | 159 void SetVisible(bool visible) override; |
159 void SetThrottleFrameProduction(bool throttle) override; | 160 void SetThrottleFrameProduction(bool throttle) override; |
160 const RendererCapabilities& GetRendererCapabilities() const override; | 161 const RendererCapabilities& GetRendererCapabilities() const override; |
161 void SetNeedsAnimate() override; | 162 void SetNeedsAnimate() override; |
162 void SetNeedsUpdateLayers() override; | 163 void SetNeedsUpdateLayers() override; |
163 void SetNeedsCommit() override; | 164 void SetNeedsCommit() override; |
164 void SetNeedsRedraw(const gfx::Rect& damage_rect) override; | 165 void SetNeedsRedraw(const gfx::Rect& damage_rect) override; |
165 void SetNextCommitWaitsForActivation() override; | 166 void SetNextCommitWaitsForActivation() override; |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 | 302 |
302 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; | 303 base::WeakPtr<ThreadProxy> main_thread_weak_ptr_; |
303 base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_; | 304 base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_; |
304 | 305 |
305 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); | 306 DISALLOW_COPY_AND_ASSIGN(ThreadProxy); |
306 }; | 307 }; |
307 | 308 |
308 } // namespace cc | 309 } // namespace cc |
309 | 310 |
310 #endif // CC_TREES_THREAD_PROXY_H_ | 311 #endif // CC_TREES_THREAD_PROXY_H_ |
OLD | NEW |