1 files changed, 13 insertions, 3 deletions
diff --git a/cc/texture_uploader.h b/cc/texture_uploader.h
index 25b8d6b..decdbda 100644
--- a/cc/texture_uploader.h
+++ b/cc/texture_uploader.h
@@ -28,9 +28,12 @@ namespace cc {
 class CC_EXPORT TextureUploader {
 public:
     static scoped_ptr<TextureUploader> create(
-        WebKit::WebGraphicsContext3D* context, bool useMapTexSubImage)
+        WebKit::WebGraphicsContext3D* context,
+        bool useMapTexSubImage,
+        bool useShallowFlush)
     {
-        return make_scoped_ptr(new TextureUploader(context, useMapTexSubImage));
+        return make_scoped_ptr(
+            new TextureUploader(context, useMapTexSubImage, useShallowFlush));
     }
     ~TextureUploader();
 
@@ -49,6 +52,8 @@ public:
                 GLenum format,
                 const gfx::Size& size);
 
+    void flush();
+
 private:
     class Query {
     public:
@@ -74,7 +79,9 @@ private:
         bool m_isNonBlocking;
     };
 
-    TextureUploader(WebKit::WebGraphicsContext3D*, bool useMapTexSubImage);
+    TextureUploader(WebKit::WebGraphicsContext3D*,
+                    bool useMapTexSubImage,
+                    bool useShallowFlush);
 
     void beginQuery();
     void endQuery();
@@ -101,6 +108,9 @@ private:
     size_t m_subImageSize;
     scoped_array<uint8> m_subImage;
 
+    bool m_useShallowFlush;
+    size_t m_numTextureUploadsSinceLastFlush;
+
     DISALLOW_COPY_AND_ASSIGN(TextureUploader);
 };