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

cc/layers/layer_impl.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/layers/layer_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/debug/trace_event_argument.h"
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
@@ skipping 604 matching lines @@
   delta_from_scroll.Scale(1.f / scale);
 
   // The delta-from-pinch component requires some explanation: A viewport of
   // size (w,h) will appear to be size (w/s,h/s) under scale s in the content
   // space. If s -> s' on the impl thread, where s' = s * ds, then the apparent
   // viewport size change in the content space due to ds is:
   //
   // (w/s',h/s') - (w/s,h/s) = (w,h)(1/s' - 1/s) = (w,h)(1 - ds)/(s ds)
   //
   gfx::Vector2dF delta_from_pinch =
-      gfx::RectF(scroll_clip_layer_->bounds()).bottom_right() - gfx::PointF();
+      gfx::Rect(scroll_clip_layer_->bounds()).bottom_right() - gfx::PointF();
   delta_from_pinch.Scale((1.f - scale_delta) / (scale * scale_delta));
 
   return delta_from_scroll + delta_from_pinch;
 }
 
 base::DictionaryValue* LayerImpl::LayerTreeAsJson() const {
   base::DictionaryValue* result = new base::DictionaryValue;
   result->SetString("LayerType", LayerTypeAsString());
 
   base::ListValue* list = new base::ListValue;
-  list->AppendDouble(bounds().width());
-  list->AppendDouble(bounds().height());
+  list->AppendInteger(bounds().width());
+  list->AppendInteger(bounds().height());
   result->Set("Bounds", list);
 
   list = new base::ListValue;
   list->AppendDouble(position_.x());
   list->AppendDouble(position_.y());
   result->Set("Position", list);
 
   const gfx::Transform& gfx_transform = draw_properties_.target_space_transform;
   double transform[16];
   gfx_transform.matrix().asColMajord(transform);
@@ skipping 116 matching lines @@
 
   layer_tree_impl_->DidAnimateScrollOffset();
 }
 
 void LayerImpl::OnAnimationWaitingForDeletion() {}
 
 bool LayerImpl::IsActive() const {
   return layer_tree_impl_->IsActiveTree();
 }
 
-gfx::SizeF LayerImpl::bounds() const {
+// TODO(aelias): Convert so that bounds returns SizeF.
+gfx::Size LayerImpl::bounds() const {
   return gfx::ToCeiledSize(gfx::SizeF(bounds_.width() + bounds_delta_.x(),
                                       bounds_.height() + bounds_delta_.y()));
 }
 
 void LayerImpl::SetBounds(const gfx::Size& bounds) {
   if (bounds_ == bounds)
     return;
 
   bounds_ = bounds;
 
@@ skipping 770 matching lines @@
 }
 
 void LayerImpl::NotifyAnimationFinished(
     base::TimeTicks monotonic_time,
     Animation::TargetProperty target_property) {
   if (target_property == Animation::ScrollOffset)
     layer_tree_impl_->InputScrollAnimationFinished();
 }
 
 }  // namespace cc