diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
commit | 284837daa07b29d6a63a748544a90b1f5842ac5c (patch) | |
tree | ecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/WebKit/chromium/tests/CCTiledLayerImplTest.cpp | |
parent | 2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff) | |
download | qtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz |
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/WebKit/chromium/tests/CCTiledLayerImplTest.cpp')
-rw-r--r-- | Source/WebKit/chromium/tests/CCTiledLayerImplTest.cpp | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/Source/WebKit/chromium/tests/CCTiledLayerImplTest.cpp b/Source/WebKit/chromium/tests/CCTiledLayerImplTest.cpp index 8b4bd20e8..c49e12c2e 100644 --- a/Source/WebKit/chromium/tests/CCTiledLayerImplTest.cpp +++ b/Source/WebKit/chromium/tests/CCTiledLayerImplTest.cpp @@ -26,6 +26,7 @@ #include "CCTiledLayerImpl.h" +#include "CCAppendQuadsData.h" #include "CCLayerTestCommon.h" #include "CCLayerTilingData.h" #include "CCSingleThreadProxy.h" @@ -76,8 +77,8 @@ TEST(CCTiledLayerImplTest, emptyQuadList) { OwnPtr<CCTiledLayerImpl> layer = createLayer(tileSize, layerSize, CCLayerTilingData::NoBorderTexels); MockCCQuadCuller quadCuller; - bool hadMissingTiles = false; - layer->appendQuads(quadCuller, hadMissingTiles); + CCAppendQuadsData data; + layer->appendQuads(quadCuller, data); const unsigned numTiles = numTilesX * numTilesY; EXPECT_EQ(quadCuller.quadList().size(), numTiles); } @@ -88,8 +89,8 @@ TEST(CCTiledLayerImplTest, emptyQuadList) layer->setVisibleContentRect(IntRect()); MockCCQuadCuller quadCuller; - bool hadMissingTiles = false; - layer->appendQuads(quadCuller, hadMissingTiles); + CCAppendQuadsData data; + layer->appendQuads(quadCuller, data); EXPECT_EQ(quadCuller.quadList().size(), 0u); } @@ -101,8 +102,8 @@ TEST(CCTiledLayerImplTest, emptyQuadList) layer->setVisibleContentRect(outsideBounds); MockCCQuadCuller quadCuller; - bool hadMissingTiles = false; - layer->appendQuads(quadCuller, hadMissingTiles); + CCAppendQuadsData data; + layer->appendQuads(quadCuller, data); EXPECT_EQ(quadCuller.quadList().size(), 0u); } @@ -112,8 +113,8 @@ TEST(CCTiledLayerImplTest, emptyQuadList) layer->setSkipsDraw(true); MockCCQuadCuller quadCuller; - bool hadMissingTiles = false; - layer->appendQuads(quadCuller, hadMissingTiles); + CCAppendQuadsData data; + layer->appendQuads(quadCuller, data); EXPECT_EQ(quadCuller.quadList().size(), 0u); } } @@ -132,10 +133,10 @@ TEST(CCTiledLayerImplTest, checkerboarding) // No checkerboarding { MockCCQuadCuller quadCuller; - bool hadMissingTiles = false; - layer->appendQuads(quadCuller, hadMissingTiles); + CCAppendQuadsData data; + layer->appendQuads(quadCuller, data); EXPECT_EQ(quadCuller.quadList().size(), 4u); - EXPECT_FALSE(hadMissingTiles); + EXPECT_FALSE(data.hadMissingTiles); for (size_t i = 0; i < quadCuller.quadList().size(); ++i) EXPECT_EQ(quadCuller.quadList()[i]->material(), CCDrawQuad::TiledContent); @@ -148,9 +149,9 @@ TEST(CCTiledLayerImplTest, checkerboarding) // All checkerboarding { MockCCQuadCuller quadCuller; - bool hadMissingTiles = false; - layer->appendQuads(quadCuller, hadMissingTiles); - EXPECT_TRUE(hadMissingTiles); + CCAppendQuadsData data; + layer->appendQuads(quadCuller, data); + EXPECT_TRUE(data.hadMissingTiles); EXPECT_EQ(quadCuller.quadList().size(), 4u); for (size_t i = 0; i < quadCuller.quadList().size(); ++i) EXPECT_NE(quadCuller.quadList()[i]->material(), CCDrawQuad::TiledContent); @@ -164,8 +165,8 @@ static void getQuads(CCQuadList& quads, CCSharedQuadStateList& sharedStates, Int layer->setBounds(layerSize); MockCCQuadCuller quadCuller(quads, sharedStates); - bool hadMissingTiles = false; - layer->appendQuads(quadCuller, hadMissingTiles); + CCAppendQuadsData data; + layer->appendQuads(quadCuller, data); } // Test with both border texels and without. |