| 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_LAYER_TREE_HOST_H_ | 5 #ifndef CC_LAYER_TREE_HOST_H_ |
| 6 #define CC_LAYER_TREE_HOST_H_ | 6 #define CC_LAYER_TREE_HOST_H_ |
| 7 | 7 |
| 8 #include <limits> | 8 #include <limits> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 | 191 |
| 192 void setDeviceScaleFactor(float); | 192 void setDeviceScaleFactor(float); |
| 193 float deviceScaleFactor() const { return m_deviceScaleFactor; } | 193 float deviceScaleFactor() const { return m_deviceScaleFactor; } |
| 194 | 194 |
| 195 HeadsUpDisplayLayer* hudLayer() const { return m_hudLayer.get(); } | 195 HeadsUpDisplayLayer* hudLayer() const { return m_hudLayer.get(); } |
| 196 | 196 |
| 197 Proxy* proxy() const { return m_proxy.get(); } | 197 Proxy* proxy() const { return m_proxy.get(); } |
| 198 | 198 |
| 199 AnimationRegistrar* animationRegistrar() const { return m_animationRegistrar
.get(); } | 199 AnimationRegistrar* animationRegistrar() const { return m_animationRegistrar
.get(); } |
| 200 | 200 |
| 201 bool blocksPendingCommit() const; |
| 202 |
| 201 protected: | 203 protected: |
| 202 LayerTreeHost(LayerTreeHostClient*, const LayerTreeSettings&); | 204 LayerTreeHost(LayerTreeHostClient*, const LayerTreeSettings&); |
| 203 bool initialize(scoped_ptr<Thread> implThread); | 205 bool initialize(scoped_ptr<Thread> implThread); |
| 204 bool initializeForTesting(scoped_ptr<Proxy> proxyForTesting); | 206 bool initializeForTesting(scoped_ptr<Proxy> proxyForTesting); |
| 205 | 207 |
| 206 private: | 208 private: |
| 207 typedef std::vector<scoped_refptr<Layer> > LayerList; | 209 typedef std::vector<scoped_refptr<Layer> > LayerList; |
| 208 | 210 |
| 209 bool initializeProxy(scoped_ptr<Proxy> proxy); | 211 bool initializeProxy(scoped_ptr<Proxy> proxy); |
| 210 void initializeRenderer(); | 212 void initializeRenderer(); |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 scoped_ptr<AnimationRegistrar> m_animationRegistrar; | 276 scoped_ptr<AnimationRegistrar> m_animationRegistrar; |
| 275 | 277 |
| 276 static bool s_needsFilterContext; | 278 static bool s_needsFilterContext; |
| 277 | 279 |
| 278 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost); | 280 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost); |
| 279 }; | 281 }; |
| 280 | 282 |
| 281 } // namespace cc | 283 } // namespace cc |
| 282 | 284 |
| 283 #endif // CC_LAYER_TREE_HOST_H_ | 285 #endif // CC_LAYER_TREE_HOST_H_ |
| OLD | NEW |