| Index: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.h
|
| diff --git a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.h b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.h
|
| index 037768f7aec805c08696d732d1bcb84b20de2106..a0c43bed737385ccfe5feabbaeda284c9a71777b 100644
|
| --- a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.h
|
| +++ b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.h
|
| @@ -8,15 +8,13 @@
|
| #include "core/layout/ng/geometry/ng_edge.h"
|
| #include "core/layout/ng/geometry/ng_logical_rect.h"
|
| #include "core/layout/ng/ng_exclusion.h"
|
| -#include "platform/heap/Handle.h"
|
|
|
| namespace blink {
|
|
|
| // 3 node R-Tree that represents available space(left, bottom, right) or
|
| // layout opportunity after the parent spatial rectangle is split by the
|
| // exclusion rectangle.
|
| -struct CORE_EXPORT NGLayoutOpportunityTreeNode
|
| - : public GarbageCollectedFinalized<NGLayoutOpportunityTreeNode> {
|
| +struct CORE_EXPORT NGLayoutOpportunityTreeNode {
|
| public:
|
| // Default constructor.
|
| // Creates a Layout Opportunity tree node that is limited by it's own edge
|
| @@ -31,9 +29,9 @@ struct CORE_EXPORT NGLayoutOpportunityTreeNode
|
| NGEdge exclusion_edge);
|
|
|
| // Children of the node.
|
| - Member<NGLayoutOpportunityTreeNode> left;
|
| - Member<NGLayoutOpportunityTreeNode> bottom;
|
| - Member<NGLayoutOpportunityTreeNode> right;
|
| + std::unique_ptr<NGLayoutOpportunityTreeNode> left;
|
| + std::unique_ptr<NGLayoutOpportunityTreeNode> bottom;
|
| + std::unique_ptr<NGLayoutOpportunityTreeNode> right;
|
|
|
| // The top layout opportunity associated with this node.
|
| NGLogicalRect opportunity;
|
| @@ -53,8 +51,6 @@ struct CORE_EXPORT NGLayoutOpportunityTreeNode
|
| bool IsLeafNode() const { return exclusions.isEmpty(); }
|
|
|
| String ToString() const;
|
| -
|
| - DECLARE_TRACE();
|
| };
|
|
|
| inline std::ostream& operator<<(std::ostream& stream,
|
|
|