Adaptively throttle texture uploads

cc/CCThreadProxy.h

Index: cc/CCThreadProxy.h
diff --git a/cc/CCThreadProxy.h b/cc/CCThreadProxy.h
index aeb4f8af4717eac4f9c7832f51b85ab5c5fe8bb9..b643b075775b8e4ee80b9bede583eeb02b4dae28 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,7 +20,6 @@ class CCLayerTreeHost;
 class CCScheduler;
 class CCScopedThreadProxy;
 class CCTextureUpdateQueue;
-class CCTextureUpdateController;
 class CCThread;
 class CCThreadProxyContextRecreationTimer;
 
@@ -49,7 +49,6 @@ public:
     virtual void didAddAnimation() OVERRIDE { }
     virtual void start() OVERRIDE;
     virtual void stop() OVERRIDE;
-    virtual size_t maxPartialTextureUpdates() const OVERRIDE;
     virtual void acquireLayerTextures() OVERRIDE;
     virtual void forceSerializeOnSwapBuffers() OVERRIDE;
 
@@ -92,7 +91,7 @@ private:
     OwnPtr<BeginFrameAndCommitState> m_pendingBeginFrameRequest;
 
     // Called on main thread
-    void beginFrame();
+    void beginFrame(size_t maxTextureUpdates);

[reveman, 2012/09/15 17:26:19]

should this be maxPartialTextureUpdates?

[brianderson, 2012/09/17 22:48:27]

Done.

     void didCommitAndDrawFrame();
     void didCompleteSwapBuffers();
     void setAnimationEvents(PassOwnPtr<CCAnimationEventsVector>, double wallClockTime);
@@ -107,7 +106,7 @@ private:
         IntRect rect;
     };
     void forceBeginFrameOnImplThread(CCCompletionEvent*);
-    void beginFrameCompleteOnImplThread(CCCompletionEvent*, PassOwnPtr<CCTextureUpdateQueue>, bool contentsTexturesWereDeleted);
+    void beginFrameCompleteOnImplThread(CCCompletionEvent*, PassOwnPtr<CCTextureUpdateQueue>, bool contentsTexturesWereDeleted, size_t maxTextureUpdates);
     void beginFrameAbortedOnImplThread();
     void requestReadbackOnImplThread(ReadbackRequest*);
     void requestStartPageScaleAnimationOnImplThread(IntSize targetPosition, bool useAnchor, float scale, double durationSec);
@@ -172,6 +171,9 @@ private:
     // Set when the next draw should post didCommitAndDrawFrame to the main thread.
     bool m_nextFrameIsNewlyCommittedFrameOnImplThread;
 
+    // We store this for when we initiate beginFrame from the main thread.
+    size_t m_mostRecentMaxTextureUpdatesOnMainThread;
+
     bool m_renderVSyncEnabled;
 };