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

cc/layers/layer_impl.h

 // Copyright 2011 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.
 
 #ifndef CC_LAYERS_LAYER_IMPL_H_
 #define CC_LAYERS_LAYER_IMPL_H_
 
 #include <set>
 #include <string>
 
@@ skipping 346 matching lines @@
   }
   int num_unclipped_descendants() const {
     return draw_properties_.num_unclipped_descendants;
   }
 
   // The client should be responsible for setting bounds, content bounds and
   // contents scale to appropriate values. LayerImpl doesn't calculate any of
   // them from the other values.
 
   void SetBounds(const gfx::Size& bounds);
-  gfx::SizeF bounds() const;
+  gfx::Size bounds() const;
   void SetBoundsDelta(const gfx::Vector2dF& bounds_delta);
   gfx::Vector2dF bounds_delta() const { return bounds_delta_; }
 
   void SetContentBounds(const gfx::Size& content_bounds);
   gfx::Size content_bounds() const { return draw_properties_.content_bounds; }
 
   float contents_scale_x() const { return draw_properties_.contents_scale_x; }
   float contents_scale_y() const { return draw_properties_.contents_scale_y; }
   void SetContentsScale(float contents_scale_x, float contents_scale_y);
 
@@ skipping 130 matching lines @@
     return scrollbar_animation_controller_.get();
   }
 
   typedef std::set<ScrollbarLayerImplBase*> ScrollbarSet;
   ScrollbarSet* scrollbars() { return scrollbars_.get(); }
   void ClearScrollbars();
   void AddScrollbar(ScrollbarLayerImplBase* layer);
   void RemoveScrollbar(ScrollbarLayerImplBase* layer);
   bool HasScrollbar(ScrollbarOrientation orientation) const;
   void ScrollbarParametersDidChange(bool on_resize);
+  int clip_height() {
+    return scroll_clip_layer_ ? scroll_clip_layer_->bounds().height() : 0;
+  }
 
   gfx::Rect LayerRectToContentRect(const gfx::RectF& layer_rect) const;
 
   virtual skia::RefPtr<SkPicture> GetPicture();
 
   virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl);
   virtual void PushPropertiesTo(LayerImpl* layer);
 
   virtual void GetAllTilesForTracing(std::set<const Tile*>* tiles) const;
   virtual void AsValueInto(base::debug::TracedValue* dict) const;
@@ skipping 176 matching lines @@
   DrawProperties<LayerImpl> draw_properties_;
 
   scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_IMPL_H_