Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)

New snapshot to include QDeclarative* -> QQml* build fixes

1 files changed, 15 insertions, 1 deletions

diff --git a/Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp b/Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp
index 5b7cb0df7..c9125a852 100644
--- a/Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp
+++ b/Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp
@@ -957,7 +957,7 @@ TEST(TiledLayerChromiumTest, partialUpdates)
     }
     ccLayerTreeHost->commitComplete();
 
-    // Partail update of 6 checkerboard tiles.
+    // Partial update of 6 checkerboard tiles.
     layer->invalidateRect(IntRect(50, 50, 200, 100));
     {
         DebugScopedSetImplThread implThread;
@@ -975,6 +975,20 @@ TEST(TiledLayerChromiumTest, partialUpdates)
     }
     ccLayerTreeHost->commitComplete();
 
+    // Partial update of 4 tiles.
+    layer->invalidateRect(IntRect(50, 50, 100, 100));
+    {
+        DebugScopedSetImplThread implThread;
+        OwnPtr<FakeCCTiledLayerImpl> layerImpl(adoptPtr(new FakeCCTiledLayerImpl(0)));
+        ccLayerTreeHost->updateLayers(updater);
+        updater.update(0, &allocator, &copier, &uploader, 4);
+        EXPECT_EQ(4, layer->fakeLayerTextureUpdater()->updateCount());
+        EXPECT_FALSE(updater.hasMoreUpdates());
+        layer->fakeLayerTextureUpdater()->clearUpdateCount();
+        layer->pushPropertiesTo(layerImpl.get());
+    }
+    ccLayerTreeHost->commitComplete();
+
     ccLayerTreeHost->setRootLayer(0);
     ccLayerTreeHost.clear();
     WebKit::WebCompositor::shutdown();