Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Unified Diff: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.h

Issue 2732223007: Revert of Combine 2 exclusions in Layout Opportunity Tree if they shadow each other (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..ea12337bc0895c4aef6281bbd81357d91fe1b5b2 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
@@ -16,7 +16,7 @@
// layout opportunity after the parent spatial rectangle is split by the
// exclusion rectangle.
struct CORE_EXPORT NGLayoutOpportunityTreeNode
- : public GarbageCollectedFinalized<NGLayoutOpportunityTreeNode> {
+ : public GarbageCollected<NGLayoutOpportunityTreeNode> {
public:
// Default constructor.
// Creates a Layout Opportunity tree node that is limited by it's own edge
@@ -41,16 +41,12 @@
// Edge that limits this layout opportunity from above.
NGEdge exclusion_edge;
- // Exclusions that splits apart this layout opportunity.
- Vector<const NGExclusion*> exclusions; // Not owned.
-
- // Exclusion that represent all combined exclusions that
- // split this node.
- std::unique_ptr<NGExclusion> combined_exclusion;
+ // Exclusion that splits apart this layout opportunity.
+ const NGExclusion* exclusion; // Not owned.
// Whether this node is a leaf node.
- // The node is a leaf if it doesn't have exclusions that split it apart.
- bool IsLeafNode() const { return exclusions.isEmpty(); }
+ // The node is a leaf if it doesn't have an exclusion that splits it apart.
+ bool IsLeafNode() const { return !exclusion; }
String ToString() const;

Powered by Google App Engine
This is Rietveld 408576698