Revert 276827 "readability review for luken"

trunk/src/ui/views/view.h

 // Copyright (c) 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.
 
 #ifndef UI_VIEWS_VIEW_H_
 #define UI_VIEWS_VIEW_H_
 
 #include <algorithm>
 #include <map>
 #include <set>
@@ skipping 1230 matching lines @@
   std::string DoPrintViewGraph(bool first, View* view_with_children);
 #endif
 
  private:
   friend class internal::PreEventDispatchHandler;
   friend class internal::PostEventDispatchHandler;
   friend class internal::RootView;
   friend class FocusManager;
   friend class Widget;
 
-  typedef gfx::RTree<intptr_t> BoundsTree;
-
   // Painting  -----------------------------------------------------------------
 
   enum SchedulePaintType {
     // Indicates the size is the same (only the origin changed).
     SCHEDULE_PAINT_SIZE_SAME,
 
     // Indicates the size changed (and possibly the origin).
     SCHEDULE_PAINT_SIZE_CHANGED
   };
 
@@ skipping 72 matching lines @@
   // Sets the layer's bounds given in DIP coordinates.
   void SetLayerBounds(const gfx::Rect& bounds_in_dip);
 
   // Sets the bit indicating that the cached bounds for this object within the
   // root view bounds tree are no longer valid. If |origin_changed| is true sets
   // the same bit for all of our children as well.
   void SetRootBoundsDirty(bool origin_changed);
 
   // If needed, updates the bounds rectangle in paint root coordinate space
   // in the supplied RTree. Recurses to children for recomputation as well.
-  void UpdateRootBounds(BoundsTree* bounds_tree, const gfx::Vector2d& offset);
+  void UpdateRootBounds(gfx::RTree* bounds_tree, const gfx::Vector2d& offset);
 
   // Remove self and all children from the supplied bounds tree. This is used,
   // for example, when a view gets a layer and therefore becomes paint root. It
   // needs to remove all references to itself and its children from any previous
   // paint root that may have been tracking it.
-  void RemoveRootBounds(BoundsTree* bounds_tree);
+  void RemoveRootBounds(gfx::RTree* bounds_tree);
 
   // Traverse up the View hierarchy to the first ancestor that is a paint root
   // and return a pointer to its |bounds_tree_| or NULL if no tree is found.
-  BoundsTree* GetBoundsTreeFromPaintRoot();
+  gfx::RTree* GetBoundsTreeFromPaintRoot();
 
   // Transformations -----------------------------------------------------------
 
   // Returns in |transform| the transform to get from coordinates of |ancestor|
   // to this. Returns true if |ancestor| is found. If |ancestor| is not found,
   // or NULL, |transform| is set to convert from root view coordinates to this.
   bool GetTransformRelativeTo(const View* ancestor,
                               gfx::Transform* transform) const;
 
   // Coordinate conversion -----------------------------------------------------
@@ skipping 160 matching lines @@
   // List of descendants wanting notification when their visible bounds change.
   scoped_ptr<Views> descendants_to_notify_;
 
   // True if the bounds on this object have changed since the last time the
   // paint root view constructed the spatial database.
   bool root_bounds_dirty_;
 
   // If this View IsPaintRoot() then this will be a pointer to a spatial data
   // structure where we will keep the bounding boxes of all our children, for
   // efficient paint damage rectangle intersection.
-  scoped_ptr<BoundsTree> bounds_tree_;
+  scoped_ptr<gfx::RTree> bounds_tree_;
 
   // Transformations -----------------------------------------------------------
 
   // Clipping parameters. skia transformation matrix does not give us clipping.
   // So we do it ourselves.
   gfx::Insets clip_insets_;
 
   // Layout --------------------------------------------------------------------
 
   // Whether the view needs to be laid out.
@@ skipping 66 matching lines @@
   // Belongs to this view, but it's reference-counted on some platforms
   // so we can't use a scoped_ptr. It's dereferenced in the destructor.
   NativeViewAccessibility* native_view_accessibility_;
 
   DISALLOW_COPY_AND_ASSIGN(View);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_VIEW_H_