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

Unified Diff: cc/layer_tree_host.h

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Apply code review comments 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
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
index c574888d59cdc87bfd34b4d3583a0e5367c49c3d..b81c7ca08452f99c9657ac2e24f5dda8e1415f7d 100644
--- a/cc/layer_tree_host.h
+++ b/cc/layer_tree_host.h
@@ -74,7 +74,7 @@ struct CC_EXPORT LayerTreeSettings {
};
// Provides information on an Impl's rendering capabilities back to the LayerTreeHost
-struct RendererCapabilities {
+struct CC_EXPORT RendererCapabilities {
RendererCapabilities();
~RendererCapabilities();
@@ -92,7 +92,7 @@ struct RendererCapabilities {
class CC_EXPORT LayerTreeHost : public RateLimiterClient {
public:
- static scoped_ptr<LayerTreeHost> create(LayerTreeHostClient*, const LayerTreeSettings&);
+ static scoped_ptr<LayerTreeHost> create(LayerTreeHostClient*, const LayerTreeSettings&, scoped_ptr<Thread> implThread);
virtual ~LayerTreeHost();
void setSurfaceReady();
@@ -133,8 +133,9 @@ public:
LayerTreeHostClient* client() { return m_client; }
- // Only used when compositing on the main thread.
void composite();
+
+ // Only used when compositing on the main thread.
void scheduleComposite();
// Composites and attempts to read back the result into the provided
@@ -212,9 +213,11 @@ public:
HeadsUpDisplayLayer* hudLayer() const { return m_hudLayer.get(); }
+ Proxy* proxy() const { return m_proxy.get(); }
+
protected:
LayerTreeHost(LayerTreeHostClient*, const LayerTreeSettings&);
- bool initialize();
+ bool initialize(scoped_ptr<Thread> implThread);
private:
typedef std::vector<scoped_refptr<Layer> > LayerList;
@@ -245,11 +248,11 @@ private:
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