Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4487)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/tiled_layer_impl_unittest.cc

Issue 11189043: cc: Rename cc classes and members to match filenames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cc/active_animation.h ('K') | « cc/tiled_layer_impl.cc ('k') | cc/tiled_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tiled_layer_impl_unittest.cc
diff --git a/cc/tiled_layer_impl_unittest.cc b/cc/tiled_layer_impl_unittest.cc
index d3e6fcb14ef471b0de7db663f9037f8c224ad557..55771da1a1548b217d6e670cbe1df4316ef8a1c6 100644
--- a/cc/tiled_layer_impl_unittest.cc
+++ b/cc/tiled_layer_impl_unittest.cc
@@ -16,16 +16,16 @@
#include "testing/gtest/include/gtest/gtest.h"
using namespace cc;
-using namespace CCLayerTestCommon;
+using namespace LayerTestCommon;
namespace {
// Create a default tiled layer with textures for all tiles and a default
// visibility of the entire layer size.
-static scoped_ptr<CCTiledLayerImpl> createLayer(const IntSize& tileSize, const IntSize& layerSize, CCLayerTilingData::BorderTexelOption borderTexels)
+static scoped_ptr<TiledLayerImpl> createLayer(const IntSize& tileSize, const IntSize& layerSize, LayerTilingData::BorderTexelOption borderTexels)
{
- scoped_ptr<CCTiledLayerImpl> layer = CCTiledLayerImpl::create(1);
- scoped_ptr<CCLayerTilingData> tiler = CCLayerTilingData::create(tileSize, borderTexels);
+ scoped_ptr<TiledLayerImpl> layer = TiledLayerImpl::create(1);
+ scoped_ptr<LayerTilingData> tiler = LayerTilingData::create(tileSize, borderTexels);
tiler->setBounds(layerSize);
layer->setTilingData(*tiler);
layer->setSkipsDraw(false);
@@ -36,7 +36,7 @@ static scoped_ptr<CCTiledLayerImpl> createLayer(const IntSize& tileSize, const I
layer->createRenderSurface();
layer->setRenderTarget(layer.get());
- CCResourceProvider::ResourceId resourceId = 1;
+ ResourceProvider::ResourceId resourceId = 1;
for (int i = 0; i < tiler->numTilesX(); ++i)
for (int j = 0; j < tiler->numTilesY(); ++j)
layer->pushTileProperties(i, j, resourceId++, IntRect(0, 0, 1, 1));
@@ -44,7 +44,7 @@ static scoped_ptr<CCTiledLayerImpl> createLayer(const IntSize& tileSize, const I
return layer.Pass();
}
-TEST(CCTiledLayerImplTest, emptyQuadList)
+TEST(TiledLayerImplTest, emptyQuadList)
{
DebugScopedSetImplThread scopedImplThread;
@@ -55,9 +55,9 @@ TEST(CCTiledLayerImplTest, emptyQuadList)
// Verify default layer does creates quads
{
- scoped_ptr<CCTiledLayerImpl> layer = createLayer(tileSize, layerSize, CCLayerTilingData::NoBorderTexels);
- MockCCQuadCuller quadCuller;
- CCAppendQuadsData data;
+ scoped_ptr<TiledLayerImpl> layer = createLayer(tileSize, layerSize, LayerTilingData::NoBorderTexels);
+ MockQuadCuller quadCuller;
+ AppendQuadsData data;
layer->appendQuads(quadCuller, data);
const unsigned numTiles = numTilesX * numTilesY;
EXPECT_EQ(quadCuller.quadList().size(), numTiles);
@@ -65,41 +65,41 @@ TEST(CCTiledLayerImplTest, emptyQuadList)
// Layer with empty visible layer rect produces no quads
{
- scoped_ptr<CCTiledLayerImpl> layer = createLayer(tileSize, layerSize, CCLayerTilingData::NoBorderTexels);
+ scoped_ptr<TiledLayerImpl> layer = createLayer(tileSize, layerSize, LayerTilingData::NoBorderTexels);
layer->setVisibleContentRect(IntRect());
- MockCCQuadCuller quadCuller;
- CCAppendQuadsData data;
+ MockQuadCuller quadCuller;
+ AppendQuadsData data;
layer->appendQuads(quadCuller, data);
EXPECT_EQ(quadCuller.quadList().size(), 0u);
}
// Layer with non-intersecting visible layer rect produces no quads
{
- scoped_ptr<CCTiledLayerImpl> layer = createLayer(tileSize, layerSize, CCLayerTilingData::NoBorderTexels);
+ scoped_ptr<TiledLayerImpl> layer = createLayer(tileSize, layerSize, LayerTilingData::NoBorderTexels);
IntRect outsideBounds(IntPoint(-100, -100), IntSize(50, 50));
layer->setVisibleContentRect(outsideBounds);
- MockCCQuadCuller quadCuller;
- CCAppendQuadsData data;
+ MockQuadCuller quadCuller;
+ AppendQuadsData data;
layer->appendQuads(quadCuller, data);
EXPECT_EQ(quadCuller.quadList().size(), 0u);
}
// Layer with skips draw produces no quads
{
- scoped_ptr<CCTiledLayerImpl> layer = createLayer(tileSize, layerSize, CCLayerTilingData::NoBorderTexels);
+ scoped_ptr<TiledLayerImpl> layer = createLayer(tileSize, layerSize, LayerTilingData::NoBorderTexels);
layer->setSkipsDraw(true);
- MockCCQuadCuller quadCuller;
- CCAppendQuadsData data;
+ MockQuadCuller quadCuller;
+ AppendQuadsData data;
layer->appendQuads(quadCuller, data);
EXPECT_EQ(quadCuller.quadList().size(), 0u);
}
}
-TEST(CCTiledLayerImplTest, checkerboarding)
+TEST(TiledLayerImplTest, checkerboarding)
{
DebugScopedSetImplThread scopedImplThread;
@@ -108,18 +108,18 @@ TEST(CCTiledLayerImplTest, checkerboarding)
const int numTilesY = 2;
const IntSize layerSize(tileSize.width() * numTilesX, tileSize.height() * numTilesY);
- scoped_ptr<CCTiledLayerImpl> layer = createLayer(tileSize, layerSize, CCLayerTilingData::NoBorderTexels);
+ scoped_ptr<TiledLayerImpl> layer = createLayer(tileSize, layerSize, LayerTilingData::NoBorderTexels);
// No checkerboarding
{
- MockCCQuadCuller quadCuller;
- CCAppendQuadsData data;
+ MockQuadCuller quadCuller;
+ AppendQuadsData data;
layer->appendQuads(quadCuller, data);
EXPECT_EQ(quadCuller.quadList().size(), 4u);
EXPECT_FALSE(data.hadMissingTiles);
for (size_t i = 0; i < quadCuller.quadList().size(); ++i)
- EXPECT_EQ(quadCuller.quadList()[i]->material(), CCDrawQuad::TiledContent);
+ EXPECT_EQ(quadCuller.quadList()[i]->material(), DrawQuad::TiledContent);
}
for (int i = 0; i < numTilesX; ++i)
@@ -128,51 +128,51 @@ TEST(CCTiledLayerImplTest, checkerboarding)
// All checkerboarding
{
- MockCCQuadCuller quadCuller;
- CCAppendQuadsData data;
+ MockQuadCuller quadCuller;
+ AppendQuadsData 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);
+ EXPECT_NE(quadCuller.quadList()[i]->material(), DrawQuad::TiledContent);
}
}
-static void getQuads(CCQuadList& quads, CCSharedQuadStateList& sharedStates, IntSize tileSize, const IntSize& layerSize, CCLayerTilingData::BorderTexelOption borderTexelOption, const IntRect& visibleContentRect)
+static void getQuads(QuadList& quads, SharedQuadStateList& sharedStates, IntSize tileSize, const IntSize& layerSize, LayerTilingData::BorderTexelOption borderTexelOption, const IntRect& visibleContentRect)
{
- scoped_ptr<CCTiledLayerImpl> layer = createLayer(tileSize, layerSize, borderTexelOption);
+ scoped_ptr<TiledLayerImpl> layer = createLayer(tileSize, layerSize, borderTexelOption);
layer->setVisibleContentRect(visibleContentRect);
layer->setBounds(layerSize);
- MockCCQuadCuller quadCuller(quads, sharedStates);
- CCAppendQuadsData data;
+ MockQuadCuller quadCuller(quads, sharedStates);
+ AppendQuadsData data;
layer->appendQuads(quadCuller, data);
}
// Test with both border texels and without.
#define WITH_AND_WITHOUT_BORDER_TEST(testFixtureName) \
- TEST(CCTiledLayerImplTest, testFixtureName##NoBorders) \
+ TEST(TiledLayerImplTest, testFixtureName##NoBorders) \
{ \
- testFixtureName(CCLayerTilingData::NoBorderTexels); \
+ testFixtureName(LayerTilingData::NoBorderTexels); \
} \
- TEST(CCTiledLayerImplTest, testFixtureName##HasBorders) \
+ TEST(TiledLayerImplTest, testFixtureName##HasBorders) \
{ \
- testFixtureName(CCLayerTilingData::HasBorderTexels);\
+ testFixtureName(LayerTilingData::HasBorderTexels);\
}
-static void coverageVisibleRectOnTileBoundaries(CCLayerTilingData::BorderTexelOption borders)
+static void coverageVisibleRectOnTileBoundaries(LayerTilingData::BorderTexelOption borders)
{
DebugScopedSetImplThread scopedImplThread;
IntSize layerSize(1000, 1000);
- CCQuadList quads;
- CCSharedQuadStateList sharedStates;
+ QuadList quads;
+ SharedQuadStateList sharedStates;
getQuads(quads, sharedStates, IntSize(100, 100), layerSize, borders, IntRect(IntPoint(), layerSize));
verifyQuadsExactlyCoverRect(quads, IntRect(IntPoint(), layerSize));
}
WITH_AND_WITHOUT_BORDER_TEST(coverageVisibleRectOnTileBoundaries);
-static void coverageVisibleRectIntersectsTiles(CCLayerTilingData::BorderTexelOption borders)
+static void coverageVisibleRectIntersectsTiles(LayerTilingData::BorderTexelOption borders)
{
DebugScopedSetImplThread scopedImplThread;
@@ -182,39 +182,39 @@ static void coverageVisibleRectIntersectsTiles(CCLayerTilingData::BorderTexelOpt
IntRect visibleContentRect(topLeft, bottomRight - topLeft);
IntSize layerSize(250, 250);
- CCQuadList quads;
- CCSharedQuadStateList sharedStates;
- getQuads(quads, sharedStates, IntSize(50, 50), IntSize(250, 250), CCLayerTilingData::NoBorderTexels, visibleContentRect);
+ QuadList quads;
+ SharedQuadStateList sharedStates;
+ getQuads(quads, sharedStates, IntSize(50, 50), IntSize(250, 250), LayerTilingData::NoBorderTexels, visibleContentRect);
verifyQuadsExactlyCoverRect(quads, visibleContentRect);
}
WITH_AND_WITHOUT_BORDER_TEST(coverageVisibleRectIntersectsTiles);
-static void coverageVisibleRectIntersectsBounds(CCLayerTilingData::BorderTexelOption borders)
+static void coverageVisibleRectIntersectsBounds(LayerTilingData::BorderTexelOption borders)
{
DebugScopedSetImplThread scopedImplThread;
IntSize layerSize(220, 210);
IntRect visibleContentRect(IntPoint(), layerSize);
- CCQuadList quads;
- CCSharedQuadStateList sharedStates;
- getQuads(quads, sharedStates, IntSize(100, 100), layerSize, CCLayerTilingData::NoBorderTexels, visibleContentRect);
+ QuadList quads;
+ SharedQuadStateList sharedStates;
+ getQuads(quads, sharedStates, IntSize(100, 100), layerSize, LayerTilingData::NoBorderTexels, visibleContentRect);
verifyQuadsExactlyCoverRect(quads, visibleContentRect);
}
WITH_AND_WITHOUT_BORDER_TEST(coverageVisibleRectIntersectsBounds);
-TEST(CCTiledLayerImplTest, textureInfoForLayerNoBorders)
+TEST(TiledLayerImplTest, textureInfoForLayerNoBorders)
{
DebugScopedSetImplThread scopedImplThread;
IntSize tileSize(50, 50);
IntSize layerSize(250, 250);
- CCQuadList quads;
- CCSharedQuadStateList sharedStates;
- getQuads(quads, sharedStates, tileSize, layerSize, CCLayerTilingData::NoBorderTexels, IntRect(IntPoint(), layerSize));
+ QuadList quads;
+ SharedQuadStateList sharedStates;
+ getQuads(quads, sharedStates, tileSize, layerSize, LayerTilingData::NoBorderTexels, IntRect(IntPoint(), layerSize));
for (size_t i = 0; i < quads.size(); ++i) {
- ASSERT_EQ(quads[i]->material(), CCDrawQuad::TiledContent) << quadString << i;
- CCTileDrawQuad* quad = static_cast<CCTileDrawQuad*>(quads[i]);
+ ASSERT_EQ(quads[i]->material(), DrawQuad::TiledContent) << quadString << i;
+ TileDrawQuad* quad = static_cast<TileDrawQuad*>(quads[i]);
EXPECT_NE(quad->resourceId(), 0u) << quadString << i;
EXPECT_EQ(quad->textureOffset(), IntPoint()) << quadString << i;
@@ -223,19 +223,19 @@ TEST(CCTiledLayerImplTest, textureInfoForLayerNoBorders)
}
}
-TEST(CCTiledLayerImplTest, tileOpaqueRectForLayerNoBorders)
+TEST(TiledLayerImplTest, tileOpaqueRectForLayerNoBorders)
{
DebugScopedSetImplThread scopedImplThread;
IntSize tileSize(50, 50);
IntSize layerSize(250, 250);
- CCQuadList quads;
- CCSharedQuadStateList sharedStates;
- getQuads(quads, sharedStates, tileSize, layerSize, CCLayerTilingData::NoBorderTexels, IntRect(IntPoint(), layerSize));
+ QuadList quads;
+ SharedQuadStateList sharedStates;
+ getQuads(quads, sharedStates, tileSize, layerSize, LayerTilingData::NoBorderTexels, IntRect(IntPoint(), layerSize));
for (size_t i = 0; i < quads.size(); ++i) {
- ASSERT_EQ(quads[i]->material(), CCDrawQuad::TiledContent) << quadString << i;
- CCTileDrawQuad* quad = static_cast<CCTileDrawQuad*>(quads[i]);
+ ASSERT_EQ(quads[i]->material(), DrawQuad::TiledContent) << quadString << i;
+ TileDrawQuad* quad = static_cast<TileDrawQuad*>(quads[i]);
EXPECT_EQ(IntRect(0, 0, 1, 1), quad->opaqueRect()) << quadString << i;
}
« cc/active_animation.h ('K') | « cc/tiled_layer_impl.cc ('k') | cc/tiled_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698