diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 21:21:59 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 21:21:59 +0000 |
| commit | 5bc29a2dabe01f1e2315bcc287f11db10df4144b (patch) | |
| tree | 0c451bebe2c40e867a935b5f52b25a242f5f825c /cc/thread_proxy.h | |
| parent | 4d8bb1a91681f8e48cc5e6b7ac29f3723eadf0d5 (diff) | |
| download | chromium_src-5bc29a2dabe01f1e2315bcc287f11db10df4144b.zip chromium_src-5bc29a2dabe01f1e2315bcc287f11db10df4144b.tar.gz chromium_src-5bc29a2dabe01f1e2315bcc287f11db10df4144b.tar.bz2 | |
Revert 165476 - Remove static thread pointers from CC
Might be causing webkit_unit_tests to fail on mac/win
BUG=152904
Review URL: https://codereview.chromium.org/11232051
TBR=jamesr@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165501 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 5ccedc1..1249687 100644 --- a/cc/thread_proxy.h +++ b/cc/thread_proxy.h @@ -5,7 +5,6 @@ #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" @@ -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 { |