| Index: content/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc
|
| diff --git a/webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc b/content/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc
|
| similarity index 92%
|
| rename from webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc
|
| rename to content/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc
|
| index ecf8c020020c0c057c17ad099addc9662793f3fb..305c7c0b8c01f1e38a4e5a8ddd16ba98f1cbb230 100644
|
| --- a/webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc
|
| +++ b/content/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc
|
| @@ -7,17 +7,17 @@
|
| #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"
|
| #include "third_party/skia/include/utils/SkMatrix44.h"
|
| #include "ui/gfx/point3_f.h"
|
| -#include "webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h"
|
|
|
| using blink::WebFloatPoint;
|
| using blink::WebSize;
|
|
|
| -namespace webkit {
|
| +namespace content {
|
| namespace {
|
|
|
| TEST(WebLayerImplFixedBoundsTest, IdentityBounds) {
|
| @@ -54,9 +54,9 @@ void CheckBoundsScaleSimple(WebLayerImplFixedBounds* layer,
|
| original_point.y() * bounds.height / fixed_bounds.height(),
|
| original_point.z());
|
| // Test if the bounds scale is correctly applied in transform.
|
| - EXPECT_POINT3F_EQ(scaled_point,
|
| - TransformPoint(layer->layer()->transform(),
|
| - original_point));
|
| + EXPECT_POINT3F_EQ(
|
| + scaled_point,
|
| + TransformPoint(layer->layer()->transform(), original_point));
|
| }
|
|
|
| TEST(WebLayerImplFixedBoundsTest, BoundsScaleSimple) {
|
| @@ -125,8 +125,8 @@ void CompareFixedBoundsLayerAndNormalLayer(const WebFloatPoint& anchor_point,
|
| }
|
|
|
| // Change of fixed bounds should not affect the target geometries.
|
| - fixed_bounds_layer->SetFixedBounds(gfx::Size(fixed_bounds.width() / 2,
|
| - fixed_bounds.height() * 2));
|
| + fixed_bounds_layer->SetFixedBounds(
|
| + gfx::Size(fixed_bounds.width() / 2, fixed_bounds.height() * 2));
|
|
|
| {
|
| cc::RenderSurfaceLayerList render_surface_layer_list;
|
| @@ -145,8 +145,7 @@ void CompareFixedBoundsLayerAndNormalLayer(const WebFloatPoint& anchor_point,
|
| // A black box test that ensures WebLayerImplFixedBounds won't change target
|
| // geometries. Simple case: identity transforms and zero anchor point.
|
| TEST(WebLayerImplFixedBoundsTest, CompareToWebLayerImplSimple) {
|
| - CompareFixedBoundsLayerAndNormalLayer(WebFloatPoint(0, 0),
|
| - gfx::Transform());
|
| + CompareFixedBoundsLayerAndNormalLayer(WebFloatPoint(0, 0), gfx::Transform());
|
| }
|
|
|
| // A black box test that ensures WebLayerImplFixedBounds won't change target
|
| @@ -166,4 +165,4 @@ TEST(WebLayerImplFixedBoundsTest, CompareToWebLayerImplComplex) {
|
| }
|
|
|
| } // namespace
|
| -} // namespace webkit
|
| +} // namespace content
|
|
|