| Index: cc/blink/web_layer_impl_fixed_bounds_unittest.cc
|
| diff --git a/content/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc b/cc/blink/web_layer_impl_fixed_bounds_unittest.cc
|
| similarity index 95%
|
| rename from content/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc
|
| rename to cc/blink/web_layer_impl_fixed_bounds_unittest.cc
|
| index 1ab52f0ddc031e2b7bede4b69def42139e3359a4..e8f48358e824e4301fa4b4a24e609bde45cbb19c 100644
|
| --- a/content/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc
|
| +++ b/cc/blink/web_layer_impl_fixed_bounds_unittest.cc
|
| @@ -3,11 +3,11 @@
|
| // found in the LICENSE file.
|
|
|
| #include <vector>
|
| +#include "cc/blink/web_layer_impl_fixed_bounds.h"
|
| #include "cc/layers/picture_image_layer.h"
|
| #include "cc/test/fake_layer_tree_host.h"
|
| #include "cc/test/geometry_test_utils.h"
|
| #include "cc/trees/layer_tree_host_common.h"
|
| -#include "content/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "third_party/WebKit/public/platform/WebFloatPoint.h"
|
| #include "third_party/WebKit/public/platform/WebSize.h"
|
| @@ -17,12 +17,11 @@
|
| using blink::WebFloatPoint;
|
| using blink::WebSize;
|
|
|
| -namespace content {
|
| +namespace cc_blink {
|
| namespace {
|
|
|
| TEST(WebLayerImplFixedBoundsTest, IdentityBounds) {
|
| scoped_ptr<WebLayerImplFixedBounds> layer(new WebLayerImplFixedBounds());
|
| - layer->setAnchorPoint(WebFloatPoint(0, 0));
|
| layer->SetFixedBounds(gfx::Size(100, 100));
|
| layer->setBounds(WebSize(100, 100));
|
| EXPECT_EQ(WebSize(100, 100), layer->bounds());
|
| @@ -61,7 +60,6 @@ void CheckBoundsScaleSimple(WebLayerImplFixedBounds* layer,
|
|
|
| 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));
|
| @@ -95,7 +93,6 @@ void CompareFixedBoundsLayerAndNormalLayer(const WebFloatPoint& anchor_point,
|
| new WebLayerImplFixedBounds(cc::PictureImageLayer::Create());
|
| 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->setPosition(position);
|
| root_layer->addChild(fixed_bounds_layer);
|
| @@ -103,7 +100,6 @@ void CompareFixedBoundsLayerAndNormalLayer(const WebFloatPoint& anchor_point,
|
| WebLayerImpl* normal_layer(new WebLayerImpl(cc::PictureImageLayer::Create()));
|
|
|
| normal_layer->setBounds(bounds);
|
| - normal_layer->setAnchorPoint(anchor_point);
|
| normal_layer->setTransform(transform.matrix());
|
| normal_layer->setPosition(position);
|
| root_layer->addChild(normal_layer);
|
| @@ -178,4 +174,4 @@ TEST(WebLayerImplFixedBoundsTest, MAYBE_CompareToWebLayerImplComplex) {
|
| }
|
|
|
| } // namespace
|
| -} // namespace content
|
| +} // namespace cc_blink
|
|
|