Adaptively throttle texture uploads

cc/ThrottledTextureUploader.h

Index: cc/ThrottledTextureUploader.h
diff --git a/cc/ThrottledTextureUploader.h b/cc/ThrottledTextureUploader.h
index f51d8662beb2c1a15d881395f1baab361af2571e..c4041325b14465d3b67e27ee8810dc6a05365fe9 100644
--- a/cc/ThrottledTextureUploader.h
+++ b/cc/ThrottledTextureUploader.h
@@ -7,6 +7,7 @@
 
 #include "TextureUploader.h"
 
+#include <deque>
 #include <wtf/Deque.h>
 
 namespace WebKit {
@@ -29,6 +30,7 @@ public:
     virtual ~ThrottledTextureUploader();
 
     virtual bool isBusy() OVERRIDE;
+    virtual double estimatedPixelsPerSecond() OVERRIDE;
     virtual void beginUploads() OVERRIDE;
     virtual void endUploads() OVERRIDE;
     virtual void uploadTexture(CCResourceProvider*, Parameters) OVERRIDE;
@@ -41,15 +43,20 @@ private:
         virtual ~Query();
 
         void begin();
-        void end();
+        void end(double pixelsUploaded);
         bool isPending();
         void wait();
+        unsigned value();
+        double pixelsUploaded();
 
     private:
         explicit Query(WebKit::WebGraphicsContext3D*);
 
         WebKit::WebGraphicsContext3D* m_context;
         unsigned m_queryId;
+        unsigned m_value;
+        bool     m_hasValue;

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

nit: unnecessary whitespaces between bool and m_hasValue.

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

Done.

+        double m_pixelsUploaded;
     };
 
     ThrottledTextureUploader(WebKit::WebGraphicsContext3D*);
@@ -61,6 +68,8 @@ private:
     size_t m_maxPendingQueries;
     Deque<OwnPtr<Query> > m_pendingQueries;
     Deque<OwnPtr<Query> > m_availableQueries;
+    std::deque<double> m_pixelsPerSecondHistory;
+    double m_pixelsUploaded;
 };
 
 }