| Index: cc/test/layer_tree_json_parser.cc
|
| diff --git a/cc/test/layer_tree_json_parser.cc b/cc/test/layer_tree_json_parser.cc
|
| index d4eec936155550def06fde3e239b8df1f62e6d79..d40c5a57b91b86d97daca00a4c8f8589f259aa4c 100644
|
| --- a/cc/test/layer_tree_json_parser.cc
|
| +++ b/cc/test/layer_tree_json_parser.cc
|
| @@ -39,7 +39,7 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
|
| if (layer_type == "SolidColorLayer") {
|
| new_layer = SolidColorLayer::Create();
|
| } else if (layer_type == "ContentLayer") {
|
| - new_layer = ContentLayer::create(content_client);
|
| + new_layer = ContentLayer::Create(content_client);
|
| } else if (layer_type == "NinePatchLayer") {
|
| success &= dict->GetList("ImageAperture", &list);
|
| int aperture_x, aperture_y, aperture_width, aperture_height;
|
| @@ -63,16 +63,16 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
|
|
|
| new_layer = nine_patch_layer;
|
| } else { // Type "Layer" or "unknown"
|
| - new_layer = Layer::create();
|
| + new_layer = Layer::Create();
|
| }
|
| - new_layer->setAnchorPoint(gfx::Point());
|
| - new_layer->setPosition(gfx::PointF(position_x, position_y));
|
| - new_layer->setBounds(gfx::Size(width, height));
|
| - new_layer->setIsDrawable(draws_content);
|
| + new_layer->SetAnchorPoint(gfx::Point());
|
| + new_layer->SetPosition(gfx::PointF(position_x, position_y));
|
| + new_layer->SetBounds(gfx::Size(width, height));
|
| + new_layer->SetIsDrawable(draws_content);
|
|
|
| double opacity;
|
| if (dict->GetDouble("Opacity", &opacity))
|
| - new_layer->setOpacity(opacity);
|
| + new_layer->SetOpacity(opacity);
|
|
|
| success &= dict->GetList("DrawTransform", &list);
|
| double transform[16];
|
| @@ -81,12 +81,12 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
|
|
|
| gfx::Transform gfxTransform;
|
| gfxTransform.matrix().setColMajord(transform);
|
| - new_layer->setTransform(gfxTransform);
|
| + new_layer->SetTransform(gfxTransform);
|
|
|
| success &= dict->GetList("Children", &list);
|
| for (ListValue::const_iterator it = list->begin();
|
| it != list->end(); ++it) {
|
| - new_layer->addChild(ParseTreeFromValue(*it, content_client));
|
| + new_layer->AddChild(ParseTreeFromValue(*it, content_client));
|
| }
|
|
|
| if (!success)
|
|
|