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

Unified Diff: cc/solid_color_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
Index: cc/solid_color_layer_impl_unittest.cc
diff --git a/cc/solid_color_layer_impl_unittest.cc b/cc/solid_color_layer_impl_unittest.cc
index 0149c38adc7e8a3e05e86cbee1131c8c68aa872b..d3a6959aeb94c5469d7cb94dc64979c46aca9309 100644
--- a/cc/solid_color_layer_impl_unittest.cc
+++ b/cc/solid_color_layer_impl_unittest.cc
@@ -15,42 +15,42 @@
#include "testing/gtest/include/gtest/gtest.h"
using namespace cc;
-using namespace CCLayerTestCommon;
+using namespace LayerTestCommon;
namespace {
-TEST(CCSolidColorLayerImplTest, verifyTilingCompleteAndNoOverlap)
+TEST(SolidColorLayerImplTest, verifyTilingCompleteAndNoOverlap)
{
DebugScopedSetImplThread scopedImplThread;
- MockCCQuadCuller quadCuller;
+ MockQuadCuller quadCuller;
IntSize layerSize = IntSize(800, 600);
IntRect visibleContentRect = IntRect(IntPoint(), layerSize);
- scoped_ptr<CCSolidColorLayerImpl> layer = CCSolidColorLayerImpl::create(1);
+ scoped_ptr<SolidColorLayerImpl> layer = SolidColorLayerImpl::create(1);
layer->setVisibleContentRect(visibleContentRect);
layer->setBounds(layerSize);
layer->setContentBounds(layerSize);
layer->createRenderSurface();
layer->setRenderTarget(layer.get());
- CCAppendQuadsData data;
+ AppendQuadsData data;
layer->appendQuads(quadCuller, data);
verifyQuadsExactlyCoverRect(quadCuller.quadList(), visibleContentRect);
}
-TEST(CCSolidColorLayerImplTest, verifyCorrectBackgroundColorInQuad)
+TEST(SolidColorLayerImplTest, verifyCorrectBackgroundColorInQuad)
{
DebugScopedSetImplThread scopedImplThread;
SkColor testColor = 0xFFA55AFF;
- MockCCQuadCuller quadCuller;
+ MockQuadCuller quadCuller;
IntSize layerSize = IntSize(100, 100);
IntRect visibleContentRect = IntRect(IntPoint(), layerSize);
- scoped_ptr<CCSolidColorLayerImpl> layer = CCSolidColorLayerImpl::create(1);
+ scoped_ptr<SolidColorLayerImpl> layer = SolidColorLayerImpl::create(1);
layer->setVisibleContentRect(visibleContentRect);
layer->setBounds(layerSize);
layer->setContentBounds(layerSize);
@@ -58,24 +58,24 @@ TEST(CCSolidColorLayerImplTest, verifyCorrectBackgroundColorInQuad)
layer->createRenderSurface();
layer->setRenderTarget(layer.get());
- CCAppendQuadsData data;
+ AppendQuadsData data;
layer->appendQuads(quadCuller, data);
ASSERT_EQ(quadCuller.quadList().size(), 1U);
- EXPECT_EQ(CCSolidColorDrawQuad::materialCast(quadCuller.quadList()[0])->color(), testColor);
+ EXPECT_EQ(SolidColorDrawQuad::materialCast(quadCuller.quadList()[0])->color(), testColor);
}
-TEST(CCSolidColorLayerImplTest, verifyCorrectOpacityInQuad)
+TEST(SolidColorLayerImplTest, verifyCorrectOpacityInQuad)
{
DebugScopedSetImplThread scopedImplThread;
const float opacity = 0.5f;
- MockCCQuadCuller quadCuller;
+ MockQuadCuller quadCuller;
IntSize layerSize = IntSize(100, 100);
IntRect visibleContentRect = IntRect(IntPoint(), layerSize);
- scoped_ptr<CCSolidColorLayerImpl> layer = CCSolidColorLayerImpl::create(1);
+ scoped_ptr<SolidColorLayerImpl> layer = SolidColorLayerImpl::create(1);
layer->setVisibleContentRect(visibleContentRect);
layer->setBounds(layerSize);
layer->setContentBounds(layerSize);
@@ -83,11 +83,11 @@ TEST(CCSolidColorLayerImplTest, verifyCorrectOpacityInQuad)
layer->createRenderSurface();
layer->setRenderTarget(layer.get());
- CCAppendQuadsData data;
+ AppendQuadsData data;
layer->appendQuads(quadCuller, data);
ASSERT_EQ(quadCuller.quadList().size(), 1U);
- EXPECT_EQ(opacity, CCSolidColorDrawQuad::materialCast(quadCuller.quadList()[0])->opacity());
+ EXPECT_EQ(opacity, SolidColorDrawQuad::materialCast(quadCuller.quadList()[0])->opacity());
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698