| Index: webkit/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc
|
| diff --git a/webkit/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc b/webkit/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc
|
| index 41d1cc40574c15d7263443f04c6b5b1af21d5e5e..cbf4335d72c6ff23fcda67aedb73bdecfe3a8d82 100644
|
| --- a/webkit/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc
|
| +++ b/webkit/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc
|
| @@ -55,7 +55,7 @@ void CheckBoundsScaleSimple(WebLayerImplFixedBounds* layer,
|
| TransformPoint(layer->layer()->transform(),
|
| original_point));
|
| EXPECT_POINT3F_EQ(original_point,
|
| - TransformPoint(layer->layer()->sublayerTransform(),
|
| + TransformPoint(layer->layer()->sublayer_transform(),
|
| scaled_point));
|
| }
|
|
|
| @@ -70,11 +70,11 @@ TEST(WebLayerImplFixedBoundsTest, BoundsScaleSimple) {
|
| }
|
|
|
| void ExpectEqualLayerRectsInTarget(cc::Layer* layer1, cc::Layer* layer2) {
|
| - gfx::RectF layer1_rect_in_target(layer1->contentBounds());
|
| - layer1->drawTransform().TransformRect(&layer1_rect_in_target);
|
| + gfx::RectF layer1_rect_in_target(layer1->content_bounds());
|
| + layer1->draw_transform().TransformRect(&layer1_rect_in_target);
|
|
|
| - gfx::RectF layer2_rect_in_target(layer2->contentBounds());
|
| - layer2->drawTransform().TransformRect(&layer2_rect_in_target);
|
| + gfx::RectF layer2_rect_in_target(layer2->content_bounds());
|
| + layer2->draw_transform().TransformRect(&layer2_rect_in_target);
|
|
|
| EXPECT_FLOAT_RECT_EQ(layer1_rect_in_target, layer2_rect_in_target);
|
| }
|
| @@ -97,7 +97,7 @@ void CompareFixedBoundsLayerAndNormalLayer(
|
| scoped_ptr<WebLayerImplFixedBounds> root_layer(new WebLayerImplFixedBounds());
|
|
|
| WebLayerImplFixedBounds* fixed_bounds_layer =
|
| - new WebLayerImplFixedBounds(cc::PictureImageLayer::create());
|
| + new WebLayerImplFixedBounds(cc::PictureImageLayer::Create());
|
| WebLayerImpl* sublayer_under_fixed_bounds_layer = new WebLayerImpl();
|
| sublayer_under_fixed_bounds_layer->setBounds(sublayer_bounds);
|
| sublayer_under_fixed_bounds_layer->setPosition(sublayer_position);
|
| @@ -110,7 +110,7 @@ void CompareFixedBoundsLayerAndNormalLayer(
|
| fixed_bounds_layer->setPosition(position);
|
| root_layer->addChild(fixed_bounds_layer);
|
|
|
| - WebLayerImpl* normal_layer(new WebLayerImpl(cc::PictureImageLayer::create()));
|
| + WebLayerImpl* normal_layer(new WebLayerImpl(cc::PictureImageLayer::Create()));
|
| WebLayerImpl* sublayer_under_normal_layer = new WebLayerImpl();
|
| sublayer_under_normal_layer->setBounds(sublayer_bounds);
|
| sublayer_under_normal_layer->setPosition(sublayer_position);
|
|
|