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

Unified Diff: cc/thread_proxy.h

Issue 11344004: Remove WebKit::Platform dependencies from cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 2 months 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 d20e8f46ecc03118463f01e82d385f24d108a228..78e23994d44ea798c57b807a8bb72afd72714e2d 100644
--- a/cc/thread_proxy.h
+++ b/cc/thread_proxy.h
@@ -21,7 +21,6 @@ class ResourceUpdateQueue;
class Scheduler;
class ScopedThreadProxy;
class Thread;
-class ThreadProxyContextRecreationTimer;
class ThreadProxy : public Proxy, LayerTreeHostImplClient, SchedulerClient, ResourceUpdateControllerClient {
public:
@@ -79,7 +78,6 @@ public:
private:
explicit ThreadProxy(LayerTreeHost*);
- friend class ThreadProxyContextRecreationTimer;
// Set on impl thread, read on main thread.
struct BeginFrameAndCommitState {
@@ -134,7 +132,7 @@ private:
bool m_commitRequested; // Set only when setNeedsCommit is called.
bool m_commitRequestSentToImplThread; // Set by setNeedsCommit and setNeedsAnimate.
bool m_forcedCommitRequested;
- scoped_ptr<ThreadProxyContextRecreationTimer> m_contextRecreationTimer;
+ base::CancelableClosure m_contextRecreationCallback;
LayerTreeHost* m_layerTreeHost;
bool m_rendererInitialized;
RendererCapabilities m_RendererCapabilitiesMainThreadCopy;
@@ -148,7 +146,7 @@ private:
scoped_ptr<Scheduler> m_schedulerOnImplThread;
- RefPtr<ScopedThreadProxy> m_mainThreadProxy;
+ scoped_refptr<ScopedThreadProxy> m_mainThreadProxy;
// Holds on to the context we might use for compositing in between initializeContext()
// and initializeRenderer() calls.
« cc/thread_impl.cc ('K') | « cc/thread_impl.cc ('k') | cc/thread_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698