| Index: cc/quad_culler_unittest.cc
|
| diff --git a/cc/quad_culler_unittest.cc b/cc/quad_culler_unittest.cc
|
| index 110a1af2198a7239d6c177586f26cc6ceb765faa..36d4e6ab71149644e679ff37847a2142c5754b95 100644
|
| --- a/cc/quad_culler_unittest.cc
|
| +++ b/cc/quad_culler_unittest.cc
|
| @@ -43,10 +43,10 @@ static scoped_ptr<TiledLayerImpl> makeLayer(TiledLayerImpl* parent, const gfx::T
|
| tiler->setBounds(layerRect.size());
|
| layer->setTilingData(*tiler);
|
| layer->setSkipsDraw(false);
|
| - layer->setDrawTransform(drawTransform);
|
| - layer->setScreenSpaceTransform(drawTransform);
|
| - layer->setVisibleContentRect(layerRect);
|
| - layer->setDrawOpacity(opacity);
|
| + layer->drawProperties().drawTransform = drawTransform;
|
| + layer->drawProperties().screenSpaceTransform = drawTransform;
|
| + layer->drawProperties().visibleContentRect = layerRect;
|
| + layer->drawProperties().drawOpacity = opacity;
|
| layer->setContentsOpaque(opaque);
|
| layer->setBounds(layerRect.size());
|
| layer->setContentBounds(layerRect.size());
|
| @@ -64,11 +64,11 @@ static scoped_ptr<TiledLayerImpl> makeLayer(TiledLayerImpl* parent, const gfx::T
|
| surfaceLayerList.push_back(layer.get());
|
| layer->renderSurface()->layerList().push_back(layer.get());
|
| } else {
|
| - layer->setRenderTarget(parent->renderTarget());
|
| + layer->drawProperties().renderTarget = parent->renderTarget();
|
| parent->renderSurface()->layerList().push_back(layer.get());
|
| rectInTarget.Union(MathUtil::mapClippedRect(parent->drawTransform(), parent->visibleContentRect()));
|
| }
|
| - layer->setDrawableContentRect(rectInTarget);
|
| + layer->drawProperties().drawableContentRect = rectInTarget;
|
|
|
| return layer.Pass();
|
| }
|
|
|