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

Unified Diff: cc/test/layer_tree_json_parser.cc

Issue 12774006: cc: Chromify Layer and LayerImpl classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: MoreAndroidCompilings Created 7 years, 9 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
« no previous file with comments | « cc/test/fake_scrollbar_layer.cc ('k') | cc/test/layer_tree_test_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« no previous file with comments | « cc/test/fake_scrollbar_layer.cc ('k') | cc/test/layer_tree_test_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698