cc/trees/layer_tree_host_unittest.cc - Issue 295193002: Get rid of graphics layer anchor points, and replace with transform origin.

Unified Diff: cc/trees/layer_tree_host_unittest.cc

Issue 295193002: Get rid of graphics layer anchor points, and replace with transform origin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed. Created 6 years, 7 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

« cc/trees/layer_tree_host_common_unittest.cc ('K') | « cc/trees/layer_tree_host_pixeltest_readback.cc ('k') | cc/trees/layer_tree_host_unittest_context.cc » ('j') | webkit/renderer/compositor_bindings/web_layer_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/trees/layer_tree_host_unittest.cc

diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc

index ce8381f9d76004c9738fa82d405c31c3445698c0..b30a091d80e3da34906c6498cdfbb044177f9607 100644

--- a/cc/trees/layer_tree_host_unittest.cc

+++ b/cc/trees/layer_tree_host_unittest.cc

@@ -1001,7 +1001,7 @@ class ContentLayerWithUpdateTracking : public ContentLayer {

private:

explicit ContentLayerWithUpdateTracking(ContentLayerClient* client)

: ContentLayer(client), paint_contents_count_(0) {

- SetAnchorPoint(gfx::PointF(0.f, 0.f));

+ SetTransformOrigin(gfx::Point3F(0.f, 0.f, 0.f));

SetBounds(gfx::Size(10, 10));

SetIsDrawable(true);

}

@@ -1091,12 +1091,12 @@ class LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers

root_layer_->SetIsDrawable(true);

root_layer_->SetBounds(gfx::Size(30, 30));

- root_layer_->SetAnchorPoint(gfx::PointF(0.f, 0.f));

+ root_layer_->SetTransformOrigin(gfx::Point3F(0.f, 0.f, 0.f));

child_layer_->SetIsDrawable(true);

child_layer_->SetPosition(gfx::Point(2, 2));

child_layer_->SetBounds(gfx::Size(10, 10));

- child_layer_->SetAnchorPoint(gfx::PointF(0.f, 0.f));

+ child_layer_->SetTransformOrigin(gfx::Point3F(0.f, 0.f, 0.f));

layer_tree_host()->SetRootLayer(root_layer_);

@@ -1340,7 +1340,7 @@ MULTI_THREAD_DELEGATING_RENDERER_NOIMPL_TEST_F(

static void SetLayerPropertiesForTesting(Layer* layer,

Layer* parent,

const gfx::Transform& transform,

- const gfx::PointF& anchor,

+ const gfx::Point3F& transform_origin,

const gfx::PointF& position,

const gfx::Size& bounds,

bool opaque) {

@@ -1348,7 +1348,7 @@ static void SetLayerPropertiesForTesting(Layer* layer,

if (parent)

parent->AddChild(layer);

layer->SetTransform(transform);

- layer->SetAnchorPoint(anchor);

+ layer->SetTransformOrigin(transform_origin);

layer->SetPosition(position);

layer->SetBounds(bounds);

layer->SetContentsOpaque(opaque);

@@ -1726,7 +1726,7 @@ class LayerTreeHostTestEvictTextures : public LayerTreeHostTest {

SetLayerPropertiesForTesting(layer_.get(),

identity_matrix,

- gfx::PointF(0.f, 0.f),

+ gfx::Point3F(0.f, 0.f, 0.f),

gfx::PointF(0.f, 0.f),

gfx::Size(10, 20),

true);

@@ -1893,7 +1893,7 @@ class LayerTreeHostTestContinuousInvalidate : public LayerTreeHostTest {

content_layer_ = ContentLayer::Create(&client_);

content_layer_->SetBounds(gfx::Size(10, 10));

content_layer_->SetPosition(gfx::PointF(0.f, 0.f));

- content_layer_->SetAnchorPoint(gfx::PointF(0.f, 0.f));

+ content_layer_->SetTransformOrigin(gfx::Point3F(0.f, 0.f, 0.f));

content_layer_->SetIsDrawable(true);

layer_tree_host()->root_layer()->AddChild(content_layer_);

@@ -2545,7 +2545,7 @@ class LayerTreeHostTestIOSurfaceDrawing : public LayerTreeHostTest {

scoped_refptr<IOSurfaceLayer> io_surface_layer = IOSurfaceLayer::Create();

io_surface_layer->SetBounds(gfx::Size(10, 10));

- io_surface_layer->SetAnchorPoint(gfx::PointF());

+ io_surface_layer->SetTransformOrigin(gfx::Point3F());

io_surface_layer->SetIsDrawable(true);

io_surface_layer->SetContentsOpaque(true);

io_surface_layer->SetIOSurfaceProperties(io_surface_id_, io_surface_size_);

@@ -2953,7 +2953,7 @@ class PushPropertiesCountingLayerImpl : public LayerImpl {

PushPropertiesCountingLayerImpl(LayerTreeImpl* tree_impl, int id)

: LayerImpl(tree_impl, id),

push_properties_count_(0) {

- SetAnchorPoint(gfx::PointF());

+ SetTransformOrigin(gfx::Point3F());

SetBounds(gfx::Size(1, 1));

}

};

@@ -2987,7 +2987,7 @@ class PushPropertiesCountingLayer : public Layer {

private:

PushPropertiesCountingLayer()

: push_properties_count_(0), persist_needs_push_properties_(false) {

- SetAnchorPoint(gfx::PointF());

+ SetTransformOrigin(gfx::Point3F());

SetBounds(gfx::Size(1, 1));

SetIsDrawable(true);

}

@@ -4013,19 +4013,19 @@ class LayerTreeHostTestPushHiddenLayer : public LayerTreeHostTest {

protected:

virtual void SetupTree() OVERRIDE {

root_layer_ = Layer::Create();

- root_layer_->SetAnchorPoint(gfx::PointF());

+ root_layer_->SetTransformOrigin(gfx::Point3F());

root_layer_->SetPosition(gfx::Point());

root_layer_->SetBounds(gfx::Size(10, 10));

parent_layer_ = SolidColorLayer::Create();

- parent_layer_->SetAnchorPoint(gfx::PointF());

+ parent_layer_->SetTransformOrigin(gfx::Point3F());

parent_layer_->SetPosition(gfx::Point());

parent_layer_->SetBounds(gfx::Size(10, 10));

parent_layer_->SetIsDrawable(true);

root_layer_->AddChild(parent_layer_);

child_layer_ = SolidColorLayer::Create();

- child_layer_->SetAnchorPoint(gfx::PointF());

+ child_layer_->SetTransformOrigin(gfx::Point3F());

child_layer_->SetPosition(gfx::Point());