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

Unified Diff: cc/resource_update_controller.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/resource_update_controller.h
diff --git a/cc/resource_update_controller.h b/cc/resource_update_controller.h
index dae5ddc094d868cc3c45c06af13dd10f0985c7dc..18c8a0c459db83ba47a01b2908548a54898021c5 100644
--- a/cc/resource_update_controller.h
+++ b/cc/resource_update_controller.h
@@ -27,9 +27,9 @@ protected:
class CC_EXPORT ResourceUpdateController {
public:
- static scoped_ptr<ResourceUpdateController> create(ResourceUpdateControllerClient* client, Thread* thread, scoped_ptr<ResourceUpdateQueue> queue, ResourceProvider* resourceProvider)
+ static scoped_ptr<ResourceUpdateController> create(ResourceUpdateControllerClient* client, Thread* thread, scoped_ptr<ResourceUpdateQueue> queue, ResourceProvider* resourceProvider, bool hasImplThread)
{
- return make_scoped_ptr(new ResourceUpdateController(client, thread, queue.Pass(), resourceProvider));
+ return make_scoped_ptr(new ResourceUpdateController(client, thread, queue.Pass(), resourceProvider, hasImplThread));
}
static size_t maxPartialTextureUpdates();
@@ -48,7 +48,7 @@ public:
virtual size_t updateMoreTexturesSize() const;
protected:
- ResourceUpdateController(ResourceUpdateControllerClient*, Thread*, scoped_ptr<ResourceUpdateQueue>, ResourceProvider*);
+ ResourceUpdateController(ResourceUpdateControllerClient*, Thread*, scoped_ptr<ResourceUpdateQueue>, ResourceProvider*, bool hasImplThread);
private:
static size_t maxFullUpdatesPerTick(ResourceProvider*);
@@ -63,6 +63,7 @@ private:
void onTimerFired();
ResourceUpdateControllerClient* m_client;
+ bool m_hasImplThread;
scoped_ptr<ResourceUpdateQueue> m_queue;
bool m_contentsTexturesPurged;
ResourceProvider* m_resourceProvider;

Powered by Google App Engine
This is Rietveld 408576698