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

Unified Diff: cc/tiled_layer_impl_unittest.cc

Issue 11280263: Organize internal properties of cc/ layer types (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Complete patch Created 8 years 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/tiled_layer_impl_unittest.cc
diff --git a/cc/tiled_layer_impl_unittest.cc b/cc/tiled_layer_impl_unittest.cc
index 2771a87609c832b071b641993067c429fa64228f..60acbf4a5f2d266e5bdfed6b377e04666c3ce645 100644
--- a/cc/tiled_layer_impl_unittest.cc
+++ b/cc/tiled_layer_impl_unittest.cc
@@ -27,12 +27,12 @@ static scoped_ptr<TiledLayerImpl> createLayer(const gfx::Size& tileSize, const g
tiler->setBounds(layerSize);
layer->setTilingData(*tiler);
layer->setSkipsDraw(false);
- layer->setVisibleContentRect(gfx::Rect(gfx::Point(), layerSize));
- layer->setDrawOpacity(1);
+ layer->drawProperties().visibleContentRect = gfx::Rect(gfx::Point(), layerSize);
+ layer->drawProperties().drawOpacity = 1;
layer->setBounds(layerSize);
layer->setContentBounds(layerSize);
layer->createRenderSurface();
- layer->setRenderTarget(layer.get());
+ layer->drawProperties().renderTarget = layer.get();
ResourceProvider::ResourceId resourceId = 1;
for (int i = 0; i < tiler->numTilesX(); ++i)
@@ -62,7 +62,7 @@ TEST(TiledLayerImplTest, emptyQuadList)
// Layer with empty visible layer rect produces no quads
{
scoped_ptr<TiledLayerImpl> layer = createLayer(tileSize, layerSize, LayerTilingData::NoBorderTexels);
- layer->setVisibleContentRect(gfx::Rect());
+ layer->drawProperties().visibleContentRect = gfx::Rect();
MockQuadCuller quadCuller;
AppendQuadsData data;
@@ -75,7 +75,7 @@ TEST(TiledLayerImplTest, emptyQuadList)
scoped_ptr<TiledLayerImpl> layer = createLayer(tileSize, layerSize, LayerTilingData::NoBorderTexels);
gfx::Rect outsideBounds(gfx::Point(-100, -100), gfx::Size(50, 50));
- layer->setVisibleContentRect(outsideBounds);
+ layer->drawProperties().visibleContentRect = outsideBounds;
MockQuadCuller quadCuller;
AppendQuadsData data;
@@ -135,7 +135,7 @@ TEST(TiledLayerImplTest, checkerboarding)
static void getQuads(QuadList& quads, SharedQuadStateList& sharedStates, gfx::Size tileSize, const gfx::Size& layerSize, LayerTilingData::BorderTexelOption borderTexelOption, const gfx::Rect& visibleContentRect)
{
scoped_ptr<TiledLayerImpl> layer = createLayer(tileSize, layerSize, borderTexelOption);
- layer->setVisibleContentRect(visibleContentRect);
+ layer->drawProperties().visibleContentRect = visibleContentRect;
layer->setBounds(layerSize);
MockQuadCuller quadCuller(quads, sharedStates);

Powered by Google App Engine
This is Rietveld 408576698