Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Unified Diff: cc/layer_tree_host.h

Issue 11369071: A speculative Revert for r165872 - Remove static thread pointers from CC, attempt 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layer_sorter_unittest.cc ('k') | cc/layer_tree_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host.h
===================================================================
--- cc/layer_tree_host.h (revision 165906)
+++ cc/layer_tree_host.h (working copy)
@@ -75,7 +75,7 @@
};
// Provides information on an Impl's rendering capabilities back to the LayerTreeHost
-struct CC_EXPORT RendererCapabilities {
+struct RendererCapabilities {
RendererCapabilities();
~RendererCapabilities();
@@ -93,7 +93,7 @@
class CC_EXPORT LayerTreeHost : public RateLimiterClient {
public:
- static scoped_ptr<LayerTreeHost> create(LayerTreeHostClient*, const LayerTreeSettings&, scoped_ptr<Thread> implThread);
+ static scoped_ptr<LayerTreeHost> create(LayerTreeHostClient*, const LayerTreeSettings&);
virtual ~LayerTreeHost();
void setSurfaceReady();
@@ -212,11 +212,9 @@
HeadsUpDisplayLayer* hudLayer() const { return m_hudLayer.get(); }
- Proxy* proxy() const { return m_proxy.get(); }
-
protected:
LayerTreeHost(LayerTreeHostClient*, const LayerTreeSettings&);
- bool initialize(scoped_ptr<Thread> implThread);
+ bool initialize();
private:
typedef std::vector<scoped_refptr<Layer> > LayerList;
@@ -245,11 +243,11 @@
base::CancelableClosure m_prepaintCallback;
LayerTreeHostClient* m_client;
- scoped_ptr<Proxy> m_proxy;
int m_commitNumber;
RenderingStats m_renderingStats;
+ scoped_ptr<Proxy> m_proxy;
bool m_rendererInitialized;
bool m_contextLost;
int m_numTimesRecreateShouldFail;
« no previous file with comments | « cc/layer_sorter_unittest.cc ('k') | cc/layer_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698