Index: cc/CCThreadProxy.h |
diff --git a/cc/CCThreadProxy.h b/cc/CCThreadProxy.h |
index aeb4f8af4717eac4f9c7832f51b85ab5c5fe8bb9..fde58573dc08ec24e6f0e762032f134a058bf8a6 100644 |
--- a/cc/CCThreadProxy.h |
+++ b/cc/CCThreadProxy.h |
@@ -10,6 +10,7 @@ |
#include "CCLayerTreeHostImpl.h" |
#include "CCProxy.h" |
#include "CCScheduler.h" |
+#include "CCTextureUpdateController.h" |
#include <wtf/OwnPtr.h> |
namespace WebCore { |
@@ -19,11 +20,10 @@ class CCLayerTreeHost; |
class CCScheduler; |
class CCScopedThreadProxy; |
class CCTextureUpdateQueue; |
-class CCTextureUpdateController; |
class CCThread; |
class CCThreadProxyContextRecreationTimer; |
-class CCThreadProxy : public CCProxy, CCLayerTreeHostImplClient, CCSchedulerClient { |
+class CCThreadProxy : public CCProxy, CCLayerTreeHostImplClient, CCSchedulerClient, CCTextureUpdateControllerClient { |
public: |
static PassOwnPtr<CCProxy> create(CCLayerTreeHost*); |
@@ -63,8 +63,6 @@ public: |
virtual void postAnimationEventsToMainThreadOnImplThread(PassOwnPtr<CCAnimationEventsVector>, double wallClockTime) OVERRIDE; |
// CCSchedulerClient implementation |
- virtual bool hasMoreResourceUpdates() const OVERRIDE; |
- |
virtual void scheduledActionBeginFrame() OVERRIDE; |
virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapIfPossible() OVERRIDE; |
virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapForced() OVERRIDE; |
@@ -73,6 +71,9 @@ public: |
virtual void scheduledActionBeginContextRecreation() OVERRIDE; |
virtual void scheduledActionAcquireLayerTexturesForMainThread() OVERRIDE; |
+ // CCTextureUpdateControllerClient implementation |
+ virtual void updateTexturesCompleted() OVERRIDE; |
+ |
private: |
explicit CCThreadProxy(CCLayerTreeHost*); |
friend class CCThreadProxyContextRecreationTimer; |