diff options
| author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 07:17:46 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 07:17:46 +0000 |
| commit | 068d7ef6aed7f5a7bdaf1e8d28b422c547be294d (patch) | |
| tree | a66fd6a12e3a9ae7ef16c66043fd4e4bebe4d28c /cc/thread_proxy.h | |
| parent | 2bddc10a9e71bd3e7d7f010b46ec96c7ab623336 (diff) | |
| download | chromium_src-068d7ef6aed7f5a7bdaf1e8d28b422c547be294d.zip chromium_src-068d7ef6aed7f5a7bdaf1e8d28b422c547be294d.tar.gz chromium_src-068d7ef6aed7f5a7bdaf1e8d28b422c547be294d.tar.bz2 | |
A speculative Revert for r165872 - Remove static thread pointers from CC, attempt 2
BUG=152904
Review URL: https://chromiumcodereview.appspot.com/11232051
TBR=aelias@chromium.org
Review URL: https://codereview.chromium.org/11369071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/thread_proxy.h')
| -rw-r--r-- | cc/thread_proxy.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h index 3638bc1..1a24ec5 100644 --- a/cc/thread_proxy.h +++ b/cc/thread_proxy.h @@ -5,7 +5,6 @@ #ifndef CC_THREAD_PROXY_H_ #define CC_THREAD_PROXY_H_ -#include "base/memory/scoped_ptr.h" #include "base/time.h" #include "cc/animation_events.h" #include "cc/completion_event.h" @@ -25,7 +24,7 @@ class Thread; class ThreadProxy : public Proxy, LayerTreeHostImplClient, SchedulerClient, ResourceUpdateControllerClient { public: - static scoped_ptr<Proxy> create(LayerTreeHost*, scoped_ptr<Thread> implThread); + static scoped_ptr<Proxy> create(LayerTreeHost*); virtual ~ThreadProxy(); @@ -78,7 +77,7 @@ public: virtual void readyToFinalizeTextureUpdates() OVERRIDE; private: - ThreadProxy(LayerTreeHost*, scoped_ptr<Thread> implThread); + explicit ThreadProxy(LayerTreeHost*); // Set on impl thread, read on main thread. struct BeginFrameAndCommitState { |