Index: cc/trees/damage_tracker_unittest.cc |
diff --git a/cc/trees/damage_tracker_unittest.cc b/cc/trees/damage_tracker_unittest.cc |
index 56d990e27293625224db603476d6606eac273def..b6a44094dc69c5ef0c0e4f1edff4f5fac7e68dc1 100644 |
--- a/cc/trees/damage_tracker_unittest.cc |
+++ b/cc/trees/damage_tracker_unittest.cc |
@@ -18,7 +18,6 @@ |
#include "third_party/skia/include/effects/SkBlurImageFilter.h" |
#include "ui/gfx/geometry/quad_f.h" |
#include "ui/gfx/geometry/rect_conversions.h" |
-#include "ui/gfx/geometry/size_conversions.h" |
namespace cc { |
namespace { |
@@ -33,7 +32,7 @@ void ExecuteCalculateDrawProperties(LayerImpl* root, |
FakeLayerTreeHostImpl::RecursiveUpdateNumChildren(root); |
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs( |
- root, gfx::ToCeiledSize(root->bounds()), render_surface_layer_list); |
+ root, root->bounds(), render_surface_layer_list); |
LayerTreeHostCommon::CalculateDrawProperties(&inputs); |
} |
@@ -1138,8 +1137,8 @@ TEST_F(DamageTrackerTest, VerifyDamageForMask) { |
scoped_ptr<LayerImpl> mask_layer = |
LayerImpl::Create(host_impl_.active_tree(), 3); |
mask_layer->SetPosition(child->position()); |
- mask_layer->SetBounds(gfx::ToCeiledSize(child->bounds())); |
- mask_layer->SetContentBounds(gfx::ToCeiledSize(child->bounds())); |
+ mask_layer->SetBounds(child->bounds()); |
+ mask_layer->SetContentBounds(child->bounds()); |
child->SetMaskLayer(mask_layer.Pass()); |
} |
LayerImpl* mask_layer = child->mask_layer(); |
@@ -1242,9 +1241,8 @@ TEST_F(DamageTrackerTest, VerifyDamageForReplicaMask) { |
scoped_ptr<LayerImpl> replica_mask_layer = |
LayerImpl::Create(host_impl_.active_tree(), 7); |
replica_mask_layer->SetPosition(gfx::PointF()); |
- replica_mask_layer->SetBounds(gfx::ToCeiledSize(grand_child1->bounds())); |
- replica_mask_layer->SetContentBounds( |
- gfx::ToCeiledSize(grand_child1->bounds())); |
+ replica_mask_layer->SetBounds(grand_child1->bounds()); |
+ replica_mask_layer->SetContentBounds(grand_child1->bounds()); |
grand_child1_replica->SetMaskLayer(replica_mask_layer.Pass()); |
} |
LayerImpl* replica_mask_layer = grand_child1_replica->mask_layer(); |
@@ -1321,9 +1319,8 @@ TEST_F(DamageTrackerTest, VerifyDamageForReplicaMaskWithTransformOrigin) { |
LayerImpl::Create(host_impl_.active_tree(), 7); |
replica_mask_layer->SetPosition(gfx::PointF()); |
// Note: this is not the transform origin being tested. |
- replica_mask_layer->SetBounds(gfx::ToCeiledSize(grand_child1->bounds())); |
- replica_mask_layer->SetContentBounds( |
- gfx::ToCeiledSize(grand_child1->bounds())); |
+ replica_mask_layer->SetBounds(grand_child1->bounds()); |
+ replica_mask_layer->SetContentBounds(grand_child1->bounds()); |
grand_child1_replica->SetMaskLayer(replica_mask_layer.Pass()); |
} |
LayerImpl* replica_mask_layer = grand_child1_replica->mask_layer(); |