| Index: ui/gfx/geometry/r_tree_base.h
|
| diff --git a/ui/gfx/geometry/r_tree_base.h b/ui/gfx/geometry/r_tree_base.h
|
| index b83aeefc0e525b978c7889f9f2e49b4b37a6947b..dbb3b6d5630974b21204d8d00c0d95e00c6a37fe 100644
|
| --- a/ui/gfx/geometry/r_tree_base.h
|
| +++ b/ui/gfx/geometry/r_tree_base.h
|
| @@ -93,13 +93,13 @@ class GFX_EXPORT RTreeBase {
|
| class GFX_EXPORT RecordBase : public NodeBase {
|
| public:
|
| explicit RecordBase(const Rect& rect);
|
| - virtual ~RecordBase();
|
| + ~RecordBase() override;
|
|
|
| - virtual void AppendIntersectingRecords(const Rect& query_rect,
|
| - Records* records_out) const override;
|
| - virtual void AppendAllRecords(Records* records_out) const override;
|
| - virtual scoped_ptr<NodeBase> RemoveAndReturnLastChild() override;
|
| - virtual int Level() const override;
|
| + void AppendIntersectingRecords(const Rect& query_rect,
|
| + Records* records_out) const override;
|
| + void AppendAllRecords(Records* records_out) const override;
|
| + scoped_ptr<NodeBase> RemoveAndReturnLastChild() override;
|
| + int Level() const override;
|
|
|
| private:
|
| friend class RTreeTest;
|
| @@ -112,13 +112,13 @@ class GFX_EXPORT RTreeBase {
|
| public:
|
| // Constructs an empty Node with |level_| of 0.
|
| Node();
|
| - virtual ~Node();
|
| + ~Node() override;
|
|
|
| - virtual void AppendIntersectingRecords(const Rect& query_rect,
|
| - Records* records_out) const override;
|
| - virtual scoped_ptr<NodeBase> RemoveAndReturnLastChild() override;
|
| - virtual int Level() const override;
|
| - virtual void AppendAllRecords(Records* matches_out) const override;
|
| + void AppendIntersectingRecords(const Rect& query_rect,
|
| + Records* records_out) const override;
|
| + scoped_ptr<NodeBase> RemoveAndReturnLastChild() override;
|
| + int Level() const override;
|
| + void AppendAllRecords(Records* matches_out) const override;
|
|
|
| // Constructs a new Node that is the parent of this Node and already has
|
| // this Node as its sole child. Valid to call only on root Nodes, meaning
|
| @@ -219,7 +219,7 @@ class GFX_EXPORT RTreeBase {
|
| Rects* vertical_bounds,
|
| Rects* horizontal_bounds);
|
|
|
| - virtual void RecomputeLocalBounds() override;
|
| + void RecomputeLocalBounds() override;
|
|
|
| // Returns the increase in overlap value, as defined in Beckmann et al. as
|
| // the sum of the areas of the intersection of all child rectangles
|
|
|