cc: Chromify Layer and LayerImpl classes.

webkit/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layer_tree_host_common.h"
 #include "cc/picture_image_layer.h"
 #include "cc/test/geometry_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
@@ skipping 37 matching lines @@
   gfx::Point3F scaled_point(
       original_point.x() * bounds.width / fixed_bounds.width(),
       original_point.y() * bounds.height / fixed_bounds.height(),
       original_point.z());
   // Test if the bounds scale is correctly applied in transform and
   // sublayerTransform.
   EXPECT_POINT3F_EQ(scaled_point,
                     TransformPoint(layer->layer()->transform(),
                                    original_point));
   EXPECT_POINT3F_EQ(original_point,
-                    TransformPoint(layer->layer()->sublayerTransform(),
+                    TransformPoint(layer->layer()->sublayer_transform(),
                                    scaled_point));
 }
 
 TEST(WebLayerImplFixedBoundsTest, BoundsScaleSimple) {
   scoped_ptr<WebLayerImplFixedBounds> layer(new WebLayerImplFixedBounds());
   layer->setAnchorPoint(WebFloatPoint(0, 0));
   CheckBoundsScaleSimple(layer.get(), WebSize(100, 200), gfx::Size(150, 250));
   // Change fixed_bounds.
   CheckBoundsScaleSimple(layer.get(), WebSize(100, 200), gfx::Size(75, 100));
   // Change bounds.
   CheckBoundsScaleSimple(layer.get(), WebSize(300, 100), gfx::Size(75, 100));
 }
 
 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);
 }
 
 void CompareFixedBoundsLayerAndNormalLayer(
     const WebFloatPoint& anchor_point,
     const gfx::Transform& transform,
     const gfx::Transform& sublayer_transform) {
   const gfx::Size kDeviceViewportSize(800, 600);
   const float kDeviceScaleFactor = 2.f;
   const float kPageScaleFactor = 1.5f;
   const int kMaxTextureSize = 512;
 
   WebSize bounds(150, 200);
   WebFloatPoint position(20, 30);
   WebSize sublayer_bounds(88, 99);
   WebFloatPoint sublayer_position(50, 60);
   gfx::Size fixed_bounds(160, 70);
 
   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);
   fixed_bounds_layer->addChild(sublayer_under_fixed_bounds_layer);
   fixed_bounds_layer->setBounds(bounds);
   fixed_bounds_layer->SetFixedBounds(fixed_bounds);
   fixed_bounds_layer->setAnchorPoint(anchor_point);
   fixed_bounds_layer->setTransform(transform.matrix());
   fixed_bounds_layer->setSublayerTransform(sublayer_transform.matrix());
   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);
 
   normal_layer->addChild(sublayer_under_normal_layer);
   normal_layer->setBounds(bounds);
   normal_layer->setAnchorPoint(anchor_point);
   normal_layer->setTransform(transform.matrix());
   normal_layer->setSublayerTransform(sublayer_transform.matrix());
   normal_layer->setPosition(position);
@@ skipping 57 matching lines @@
   CompareFixedBoundsLayerAndNormalLayer(WebFloatPoint(0, 0),
                                         transform,
                                         sublayer_transform);
 
   // With non-zero anchor point, WebLayerImplFixedBounds will fall back to
   // WebLayerImpl.
   CompareFixedBoundsLayerAndNormalLayer(WebFloatPoint(0.4f, 0.6f),
                                         transform,
                                         sublayer_transform);
 }