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

cc/ThrottledTextureUploaderTest.cpp

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "ThrottledTextureUploader.h"
 
 #include "Extensions3DChromium.h"
 #include "FakeWebGraphicsContext3D.h"
@@ skipping 34 matching lines @@
 
 class FakeTexture : public cc::LayerTextureUpdater::Texture {
 public:
   FakeTexture() : LayerTextureUpdater::Texture(
       PassOwnPtr<cc::CCPrioritizedTexture>()) { }
 
     virtual void updateRect(cc::CCResourceProvider* , const cc::IntRect&, const cc::IntSize&) OVERRIDE { }
 };
 
 
-TEST(ThrottledTextureUploaderTest, NumPendingUploads)
+TEST(ThrottledTextureUploaderTest, NumBlockingUploads)
 {
     OwnPtr<FakeWebGraphicsContext3DWithQueryTesting> fakeContext(adoptPtr(new FakeWebGraphicsContext3DWithQueryTesting));
     OwnPtr<ThrottledTextureUploader> uploader = ThrottledTextureUploader::create(fakeContext.get());
     OwnPtr<FakeTexture> texture = adoptPtr(new FakeTexture);
     TextureUploader::Parameters upload;
     upload.texture = texture.get();
     upload.sourceRect = IntRect();
     upload.destOffset = IntSize();
 
     fakeContext->setResultAvailable(0);
-    EXPECT_EQ(0, uploader->numPendingUploads());
+    EXPECT_EQ(0, uploader->numBlockingUploads());
     uploader->beginUploads();
     uploader->uploadTexture(NULL, upload);
     uploader->endUploads();
-    EXPECT_EQ(1, uploader->numPendingUploads());
+    EXPECT_EQ(1, uploader->numBlockingUploads());
     uploader->beginUploads();
     uploader->uploadTexture(NULL, upload);
     uploader->endUploads();
-    EXPECT_EQ(2, uploader->numPendingUploads());
+    EXPECT_EQ(2, uploader->numBlockingUploads());
 
     fakeContext->setResultAvailable(1);
-    EXPECT_EQ(0, uploader->numPendingUploads());
+    EXPECT_EQ(0, uploader->numBlockingUploads());
     uploader->beginUploads();
     uploader->uploadTexture(NULL, upload);
     uploader->endUploads();
-    EXPECT_EQ(0, uploader->numPendingUploads());
+    EXPECT_EQ(0, uploader->numBlockingUploads());
     uploader->beginUploads();
     uploader->uploadTexture(NULL, upload);
     uploader->uploadTexture(NULL, upload);
     uploader->endUploads();
-    EXPECT_EQ(0, uploader->numPendingUploads());
+    EXPECT_EQ(0, uploader->numBlockingUploads());
+}
+
+TEST(ThrottledTextureUploaderTest, MarkPendingUploadsAsNonBlocking)
+{
+    OwnPtr<FakeWebGraphicsContext3DWithQueryTesting> fakeContext(adoptPtr(new FakeWebGraphicsContext3DWithQueryTesting));
+    OwnPtr<ThrottledTextureUploader> uploader = ThrottledTextureUploader::create(fakeContext.get());
+    OwnPtr<FakeTexture> texture = adoptPtr(new FakeTexture);
+    TextureUploader::Parameters upload;
+    upload.texture = texture.get();
+    upload.sourceRect = IntRect();
+    upload.destOffset = IntSize();
+
+    fakeContext->setResultAvailable(0);
+    EXPECT_EQ(0, uploader->numBlockingUploads());
+    uploader->beginUploads();
+    uploader->uploadTexture(NULL, upload);
+    uploader->uploadTexture(NULL, upload);
+    uploader->endUploads();
+    EXPECT_EQ(2, uploader->numBlockingUploads());
+
+    uploader->markPendingUploadsAsNonBlocking();
+    EXPECT_EQ(0, uploader->numBlockingUploads());
+    uploader->beginUploads();
+    uploader->uploadTexture(NULL, upload);
+    uploader->endUploads();
+    EXPECT_EQ(1, uploader->numBlockingUploads());
+
+    fakeContext->setResultAvailable(1);
+    EXPECT_EQ(0, uploader->numBlockingUploads());
+    uploader->beginUploads();
+    uploader->uploadTexture(NULL, upload);
+    uploader->endUploads();
+    uploader->markPendingUploadsAsNonBlocking();
+    EXPECT_EQ(0, uploader->numBlockingUploads());
 }
 
 } // namespace