Chromium Code Reviews| 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/time.h" | 10 #include "base/time/time.h" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 85 virtual void DidManageTiles() OVERRIDE {} | 85 virtual void DidManageTiles() OVERRIDE {} |
| 86 virtual void SetDebugState(const LayerTreeDebugState& debug_state) OVERRIDE {} | 86 virtual void SetDebugState(const LayerTreeDebugState& debug_state) OVERRIDE {} |
| 87 | 87 |
| 88 // Attempts to create the context and renderer synchronously. Calls | 88 // Attempts to create the context and renderer synchronously. Calls |
| 89 // LayerTreeHost::OnCreateAndInitializeOutputSurfaceAttempted with the result. | 89 // LayerTreeHost::OnCreateAndInitializeOutputSurfaceAttempted with the result. |
| 90 void CreateAndInitializeOutputSurface(); | 90 void CreateAndInitializeOutputSurface(); |
| 91 | 91 |
| 92 // Called by the legacy path where RenderWidget does the scheduling. | 92 // Called by the legacy path where RenderWidget does the scheduling. |
| 93 void CompositeImmediately(base::TimeTicks frame_begin_time); | 93 void CompositeImmediately(base::TimeTicks frame_begin_time); |
| 94 | 94 |
| 95 LayerTreeHostImpl* layer_tree_host_impl() const { | |
|
enne (OOO)
2014/07/28 23:37:40
Is this change needed?
troyhildebrandt
2014/07/29 19:57:17
Not any more, definitely an artifact of a previous
| |
| 96 return layer_tree_host_impl_.get(); | |
| 97 } | |
| 98 | |
| 95 private: | 99 private: |
| 96 SingleThreadProxy( | 100 SingleThreadProxy( |
| 97 LayerTreeHost* layer_tree_host, | 101 LayerTreeHost* layer_tree_host, |
| 98 LayerTreeHostSingleThreadClient* client, | 102 LayerTreeHostSingleThreadClient* client, |
| 99 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner); | 103 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner); |
| 100 | 104 |
| 101 void DoCommit(scoped_ptr<ResourceUpdateQueue> queue); | 105 void DoCommit(scoped_ptr<ResourceUpdateQueue> queue); |
| 102 bool DoComposite(base::TimeTicks frame_begin_time, | 106 bool DoComposite(base::TimeTicks frame_begin_time, |
| 103 LayerTreeHostImpl::FrameData* frame); | 107 LayerTreeHostImpl::FrameData* frame); |
| 104 void DidSwapFrame(); | 108 void DidSwapFrame(); |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 179 private: | 183 private: |
| 180 DebugScopedSetImplThread impl_thread_; | 184 DebugScopedSetImplThread impl_thread_; |
| 181 DebugScopedSetMainThreadBlocked main_thread_blocked_; | 185 DebugScopedSetMainThreadBlocked main_thread_blocked_; |
| 182 | 186 |
| 183 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked); | 187 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked); |
| 184 }; | 188 }; |
| 185 | 189 |
| 186 } // namespace cc | 190 } // namespace cc |
| 187 | 191 |
| 188 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_ | 192 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_ |
| OLD | NEW |