cc: Never block on uploads from previous frame and increase max pending uploads.

cc/ThrottledTextureUploader.h

Index: cc/ThrottledTextureUploader.h
diff --git a/cc/ThrottledTextureUploader.h b/cc/ThrottledTextureUploader.h
index 49dbf101eb6ef647976ae0c3e10494336f356917..96e44d8ef34474c9a1a8eda4bcf0c9b634c62997 100644
--- a/cc/ThrottledTextureUploader.h
+++ b/cc/ThrottledTextureUploader.h
@@ -25,7 +25,8 @@ public:
     }
     virtual ~ThrottledTextureUploader();
 
-    virtual size_t numPendingUploads() OVERRIDE;
+    virtual size_t numBlockingUploads() OVERRIDE;
+    virtual void markPendingUploadsAsNonBlocking() OVERRIDE;
     virtual double estimatedTexturesPerSecond() OVERRIDE;
     virtual void beginUploads() OVERRIDE;
     virtual void endUploads() OVERRIDE;
@@ -44,6 +45,8 @@ private:
         void wait();
         unsigned value();
         size_t texturesUploaded();
+        void markAsNonBlocking();
+        bool isNonBlocking();
 
     private:
         explicit Query(WebKit::WebGraphicsContext3D*);
@@ -53,6 +56,7 @@ private:
         unsigned m_value;
         bool m_hasValue;
         size_t m_texturesUploaded;
+        bool m_isNonBlocking;
     };
 
     ThrottledTextureUploader(WebKit::WebGraphicsContext3D*);
@@ -64,7 +68,7 @@ private:
     Deque<OwnPtr<Query> > m_availableQueries;
     std::deque<double> m_texturesPerSecondHistory;
     size_t m_texturesUploaded;
-    size_t m_numPendingTextureUploads;
+    size_t m_numBlockingTextureUploads;
 
     DISALLOW_COPY_AND_ASSIGN(ThrottledTextureUploader);
 };