Revert of "Converted LayerImpl::bounds() to return SizeF."

cc/trees/occlusion_tracker_unittest.cc

 // Copyright 2012 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/trees/occlusion_tracker.h"
 
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/output/filter_operation.h"
 #include "cc/output/filter_operations.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/test_occlusion_tracker.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 namespace {
 
 class TestContentLayer : public Layer {
  public:
   TestContentLayer() : Layer(), override_opaque_contents_rect_(false) {
     SetIsDrawable(true);
   }
@@ skipping 267 matching lines @@
             base::Unretained(this))));
     layer->PassCopyRequests(&requests);
   }
 
   void CalcDrawEtc(TestContentLayerImpl* root) {
     DCHECK(root == root_.get());
     DCHECK(!root->render_surface());
 
     Types::RecursiveUpdateNumChildren(root);
     LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
-        root,
-        gfx::ToCeiledSize(root->bounds()),
-        &render_surface_layer_list_impl_);
+        root, root->bounds(), &render_surface_layer_list_impl_);
     inputs.can_adjust_raster_scales = true;
     LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 
     layer_iterator_ = layer_iterator_begin_ =
         Types::TestLayerIterator::Begin(&render_surface_layer_list_impl_);
   }
 
   void CalcDrawEtc(TestContentLayer* root) {
     DCHECK(root == root_.get());
     DCHECK(!root->render_surface());
 
     render_surface_layer_list_.reset(new RenderSurfaceLayerList);
     LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
-        root,
-        gfx::ToCeiledSize(root->bounds()),
-        render_surface_layer_list_.get());
+        root, root->bounds(), render_surface_layer_list_.get());
     inputs.can_adjust_raster_scales = true;
     LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 
     layer_iterator_ = layer_iterator_begin_ =
         Types::TestLayerIterator::Begin(render_surface_layer_list_.get());
   }
 
   void EnterLayer(typename Types::LayerType* layer,
                   typename Types::OcclusionTrackerType* occlusion) {
     ASSERT_EQ(*layer_iterator_, layer);
@@ skipping 69 matching lines @@
                      const gfx::Size& bounds) {
     SetBaseProperties(layer, transform, position, bounds);
   }
 
   void SetProperties(LayerImpl* layer,
                      const gfx::Transform& transform,
                      const gfx::PointF& position,
                      const gfx::Size& bounds) {
     SetBaseProperties(layer, transform, position, bounds);
 
-    layer->SetContentBounds(gfx::ToCeiledSize(layer->bounds()));
+    layer->SetContentBounds(layer->bounds());
   }
 
   void SetReplica(Layer* owning_layer, scoped_refptr<Layer> layer) {
     owning_layer->SetReplicaLayer(layer.get());
     replica_layers_.push_back(layer);
   }
 
   void SetReplica(LayerImpl* owning_layer, scoped_ptr<LayerImpl> layer) {
     owning_layer->SetReplicaLayer(layer.Pass());
   }
@@ skipping 2874 matching lines @@
     EXPECT_EQ(gfx::Rect(),
               occlusion.UnoccludedSurfaceContentRect(
                   surface, gfx::Rect(80, 70, 50, 50)));
   }
 };
 
 ALL_OCCLUSIONTRACKER_TEST(OcclusionTrackerTestUnoccludedSurfaceQuery)
 
 }  // namespace
 }  // namespace cc