Roll cc snapshot up to 127605

cc/CCThreadProxy.h

Index: cc/CCThreadProxy.h
diff --git a/cc/CCThreadProxy.h b/cc/CCThreadProxy.h
index c488dcbaeed17c029ca2a7f28e7fb36229824a77..bf9c3782aa6f08ed87bfc0186191cfa96aa20b33 100644
--- a/cc/CCThreadProxy.h
+++ b/cc/CCThreadProxy.h
@@ -58,13 +58,14 @@ public:
     virtual void didLoseContextOnImplThread() OVERRIDE;
     virtual void onSwapBuffersCompleteOnImplThread() OVERRIDE;
     virtual void onVSyncParametersChanged(double monotonicTimebase, double intervalInSeconds) OVERRIDE;
+    virtual void onCanDrawStateChanged(bool canDraw) OVERRIDE;
     virtual void setNeedsRedrawOnImplThread() OVERRIDE;
     virtual void setNeedsCommitOnImplThread() OVERRIDE;
     virtual void postAnimationEventsToMainThreadOnImplThread(PassOwnPtr<CCAnimationEventsVector>, double wallClockTime) OVERRIDE;
 
     // CCSchedulerClient implementation
-    virtual bool canDraw() OVERRIDE;
     virtual bool hasMoreResourceUpdates() const OVERRIDE;
+
     virtual void scheduledActionBeginFrame() OVERRIDE;
     virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapIfPossible() OVERRIDE;
     virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapForced() OVERRIDE;