cc: Only use upload throttling when performing full texture uploads.

webkit/compositor_bindings/TiledLayerChromiumTest.cpp

 // Copyright 2011 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 "TiledLayerChromium.h"
 
 #include "BitmapCanvasLayerTextureUpdater.h"
 #include "CCAnimationTestCommon.h"
@@ skipping 78 matching lines @@
             return m_layerImpl;
         }
     private:
         FakeCCTiledLayerImpl* m_layerImpl;
     };
     void textureManagerClearAllMemory(CCPrioritizedTextureManager* textureManager, CCResourceProvider* resourceProvider)
     {
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
         textureManager->clearAllMemory(resourceProvider);
     }
-    void updateTextures(int count = 500)
+    void updateTextures()
     {
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
-        CCTextureUpdateController::updateTextures(m_resourceProvider.get(), &m_uploader, &m_queue, count);
+        CCTextureUpdateController::updateTextures(m_resourceProvider.get(), &m_uploader, &m_queue);
     }
     void layerPushPropertiesTo(FakeTiledLayerChromium* layer, FakeCCTiledLayerImpl* layerImpl)
     {
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
         layer->pushPropertiesTo(layerImpl);
     }
     void layerUpdate(FakeTiledLayerChromium* layer, TestCCOcclusionTracker* occluded)
     {
         DebugScopedSetMainThread mainThread;
         layer->update(m_queue, occluded, m_stats);
@@ skipping 683 matching lines @@
     layer->setVisibleContentRect(contentRect);
     layer->invalidateContentRect(contentRect);
 
     ccLayerTreeHost->setRootLayer(layer);
     ccLayerTreeHost->setViewportSize(IntSize(300, 200), IntSize(300, 200));
 
     // Full update of all 6 tiles.
     ccLayerTreeHost->updateLayers(m_queue, std::numeric_limits<size_t>::max());
     {
         ScopedFakeCCTiledLayerImpl layerImpl(1);
-        updateTextures(4);
-        EXPECT_EQ(4, layer->fakeLayerTextureUpdater()->updateCount());
-        EXPECT_TRUE(m_queue.hasMoreUpdates());
-        layer->fakeLayerTextureUpdater()->clearUpdateCount();
-        updateTextures(4);
-        EXPECT_EQ(2, layer->fakeLayerTextureUpdater()->updateCount());
+        EXPECT_EQ(6, m_queue.fullUploadSize());
+        EXPECT_EQ(0, m_queue.partialUploadSize());
+        updateTextures();
+        EXPECT_EQ(6, layer->fakeLayerTextureUpdater()->updateCount());
         EXPECT_FALSE(m_queue.hasMoreUpdates());
         layer->fakeLayerTextureUpdater()->clearUpdateCount();
         layerPushPropertiesTo(layer.get(), layerImpl.get());
     }
     ccLayerTreeHost->commitComplete();
 
     // Full update of 3 tiles and partial update of 3 tiles.
     layer->invalidateContentRect(IntRect(0, 0, 300, 150));
     ccLayerTreeHost->updateLayers(m_queue, std::numeric_limits<size_t>::max());
     {
         ScopedFakeCCTiledLayerImpl layerImpl(1);
-        updateTextures(4);
-        EXPECT_EQ(3, layer->fakeLayerTextureUpdater()->updateCount());
-        EXPECT_TRUE(m_queue.hasMoreUpdates());
-        layer->fakeLayerTextureUpdater()->clearUpdateCount();
-        updateTextures(4);
-        EXPECT_EQ(3, layer->fakeLayerTextureUpdater()->updateCount());
+        EXPECT_EQ(3, m_queue.fullUploadSize());
+        EXPECT_EQ(3, m_queue.partialUploadSize());
+        updateTextures();
+        EXPECT_EQ(6, layer->fakeLayerTextureUpdater()->updateCount());
         EXPECT_FALSE(m_queue.hasMoreUpdates());
         layer->fakeLayerTextureUpdater()->clearUpdateCount();
         layerPushPropertiesTo(layer.get(), layerImpl.get());
     }
     ccLayerTreeHost->commitComplete();
 
     // Partial update of 6 tiles.
     layer->invalidateContentRect(IntRect(50, 50, 200, 100));
     {
         ScopedFakeCCTiledLayerImpl layerImpl(1);
         ccLayerTreeHost->updateLayers(m_queue, std::numeric_limits<size_t>::max());
-        updateTextures(4);
-        EXPECT_EQ(2, layer->fakeLayerTextureUpdater()->updateCount());
-        EXPECT_TRUE(m_queue.hasMoreUpdates());
-        layer->fakeLayerTextureUpdater()->clearUpdateCount();
-        updateTextures(4);
-        EXPECT_EQ(4, layer->fakeLayerTextureUpdater()->updateCount());
+        EXPECT_EQ(2, m_queue.fullUploadSize());
+        EXPECT_EQ(4, m_queue.partialUploadSize());
+        updateTextures();
+        EXPECT_EQ(6, layer->fakeLayerTextureUpdater()->updateCount());
         EXPECT_FALSE(m_queue.hasMoreUpdates());
         layer->fakeLayerTextureUpdater()->clearUpdateCount();
         layerPushPropertiesTo(layer.get(), layerImpl.get());
     }
     ccLayerTreeHost->commitComplete();
 
     // Checkerboard all tiles.
     layer->invalidateContentRect(IntRect(0, 0, 300, 200));
     {
         ScopedFakeCCTiledLayerImpl layerImpl(1);
         layerPushPropertiesTo(layer.get(), layerImpl.get());
     }
     ccLayerTreeHost->commitComplete();
 
     // Partial update of 6 checkerboard tiles.
     layer->invalidateContentRect(IntRect(50, 50, 200, 100));
     {
         ScopedFakeCCTiledLayerImpl layerImpl(1);
         ccLayerTreeHost->updateLayers(m_queue, std::numeric_limits<size_t>::max());
-        updateTextures(4);
-        EXPECT_EQ(4, layer->fakeLayerTextureUpdater()->updateCount());
-        EXPECT_TRUE(m_queue.hasMoreUpdates());
-        layer->fakeLayerTextureUpdater()->clearUpdateCount();
-        updateTextures(4);
-        EXPECT_EQ(2, layer->fakeLayerTextureUpdater()->updateCount());
+        EXPECT_EQ(6, m_queue.fullUploadSize());
+        EXPECT_EQ(0, m_queue.partialUploadSize());
+        updateTextures();
+        EXPECT_EQ(6, layer->fakeLayerTextureUpdater()->updateCount());
         EXPECT_FALSE(m_queue.hasMoreUpdates());
         layer->fakeLayerTextureUpdater()->clearUpdateCount();
         layerPushPropertiesTo(layer.get(), layerImpl.get());
     }
     ccLayerTreeHost->commitComplete();
 
     // Partial update of 4 tiles.
     layer->invalidateContentRect(IntRect(50, 50, 100, 100));
     {
         ScopedFakeCCTiledLayerImpl layerImpl(1);
         ccLayerTreeHost->updateLayers(m_queue, std::numeric_limits<size_t>::max());
-        updateTextures(4);
+        EXPECT_EQ(0, m_queue.fullUploadSize());
+        EXPECT_EQ(4, m_queue.partialUploadSize());
+        updateTextures();
         EXPECT_EQ(4, layer->fakeLayerTextureUpdater()->updateCount());
         EXPECT_FALSE(m_queue.hasMoreUpdates());
         layer->fakeLayerTextureUpdater()->clearUpdateCount();
         layerPushPropertiesTo(layer.get(), layerImpl.get());
     }
     ccLayerTreeHost->commitComplete();
 
     textureManagerClearAllMemory(ccLayerTreeHost->contentsTextureManager(), m_resourceProvider.get());
     ccLayerTreeHost->setRootLayer(0);
     ccLayerTreeHost.clear();
@@ skipping 450 matching lines @@
 
     ccLayerTreeHost->setRootLayer(root);
     ccLayerTreeHost->setViewportSize(rootRect.size(), rootRect.size());
 
     // With a huge memory limit, all layers should update and push their textures.
     root->invalidateContentRect(rootRect);
     child->invalidateContentRect(childRect);
     child2->invalidateContentRect(child2Rect);
     ccLayerTreeHost->updateLayers(m_queue, std::numeric_limits<size_t>::max());
     {
-        updateTextures(1000);
+        updateTextures();
         EXPECT_EQ(6, root->fakeLayerTextureUpdater()->updateCount());
         EXPECT_EQ(3, child->fakeLayerTextureUpdater()->updateCount());
         EXPECT_EQ(3, child2->fakeLayerTextureUpdater()->updateCount());
         EXPECT_FALSE(m_queue.hasMoreUpdates());
 
         root->fakeLayerTextureUpdater()->clearUpdateCount();
         child->fakeLayerTextureUpdater()->clearUpdateCount();
         child2->fakeLayerTextureUpdater()->clearUpdateCount();
 
         ScopedFakeCCTiledLayerImpl rootImpl(root->id());
@@ skipping 13 matching lines @@
     ccLayerTreeHost->commitComplete();
 
     // With a memory limit that includes only the root layer (3x2 tiles) and half the surface that
     // the child layers draw into, the child layers will not be allocated. If the surface isn't
     // accounted for, then one of the children would fit within the memory limit.
     root->invalidateContentRect(rootRect);
     child->invalidateContentRect(childRect);
     child2->invalidateContentRect(child2Rect);
     ccLayerTreeHost->updateLayers(m_queue, (3 * 2 + 3 * 1) * (100 * 100) * 4);
     {
-        updateTextures(1000);
+        updateTextures();
         EXPECT_EQ(6, root->fakeLayerTextureUpdater()->updateCount());
         EXPECT_EQ(0, child->fakeLayerTextureUpdater()->updateCount());
         EXPECT_EQ(0, child2->fakeLayerTextureUpdater()->updateCount());
         EXPECT_FALSE(m_queue.hasMoreUpdates());
 
         root->fakeLayerTextureUpdater()->clearUpdateCount();
         child->fakeLayerTextureUpdater()->clearUpdateCount();
         child2->fakeLayerTextureUpdater()->clearUpdateCount();
 
         ScopedFakeCCTiledLayerImpl rootImpl(root->id());
@@ skipping 14 matching lines @@
 
     // With a memory limit that includes only half the root layer, no contents will be
     // allocated. If render surface memory wasn't accounted for, there is enough space
     // for one of the children layers, but they draw into a surface that can't be
     // allocated.
     root->invalidateContentRect(rootRect);
     child->invalidateContentRect(childRect);
     child2->invalidateContentRect(child2Rect);
     ccLayerTreeHost->updateLayers(m_queue, (3 * 1) * (100 * 100) * 4);
     {
-        updateTextures(1000);
+        updateTextures();
         EXPECT_EQ(0, root->fakeLayerTextureUpdater()->updateCount());
         EXPECT_EQ(0, child->fakeLayerTextureUpdater()->updateCount());
         EXPECT_EQ(0, child2->fakeLayerTextureUpdater()->updateCount());
         EXPECT_FALSE(m_queue.hasMoreUpdates());
 
         root->fakeLayerTextureUpdater()->clearUpdateCount();
         child->fakeLayerTextureUpdater()->clearUpdateCount();
         child2->fakeLayerTextureUpdater()->clearUpdateCount();
 
         ScopedFakeCCTiledLayerImpl rootImpl(root->id());
@@ skipping 111 matching lines @@
     updateTextures();
 
     // Invalidate the entire layer in layer space. When painting, the rect given to webkit should match the layer's bounds.
     layer->setNeedsDisplayRect(layerRect);
     layer->update(m_queue, 0, m_stats);
 
     EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect());
 }
 
 } // namespace