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

Unified Diff: cc/thread_proxy.h

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix unit test hang by explicitly NULLing out impl_thread_message_loop_proxy_ 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
Index: cc/thread_proxy.h
diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h
index 12496872d44a182df596178409b26e67b5641d29..5ccedc18c0b48897a0055b755f3297292fa5bb5d 100644
--- a/cc/thread_proxy.h
+++ b/cc/thread_proxy.h
@@ -5,6 +5,7 @@
#ifndef CCThreadProxy_h
#define CCThreadProxy_h
+#include "base/memory/scoped_ptr.h"
#include "base/time.h"
#include "cc/animation_events.h"
#include "cc/completion_event.h"
@@ -24,7 +25,7 @@ class Thread;
class ThreadProxy : public Proxy, LayerTreeHostImplClient, SchedulerClient, ResourceUpdateControllerClient {
public:
- static scoped_ptr<Proxy> create(LayerTreeHost*);
+ static scoped_ptr<Proxy> create(LayerTreeHost*, scoped_ptr<Thread> implThread);
virtual ~ThreadProxy();
@@ -77,7 +78,7 @@ public:
virtual void readyToFinalizeTextureUpdates() OVERRIDE;
private:
- explicit ThreadProxy(LayerTreeHost*);
+ ThreadProxy(LayerTreeHost*, scoped_ptr<Thread> implThread);
// Set on impl thread, read on main thread.
struct BeginFrameAndCommitState {

Powered by Google App Engine
This is Rietveld 408576698