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

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

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
« no previous file with comments | « third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.cc b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.cc
index b737001fb829c76a3479175dce47bdf1b6f29c5c..49b04cd0ea746d617c0d4040726f8e4458d927f8 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.cc
@@ -8,7 +8,7 @@
NGLayoutOpportunityTreeNode::NGLayoutOpportunityTreeNode(
const NGLogicalRect opportunity)
- : opportunity(opportunity), combined_exclusion(nullptr) {
+ : opportunity(opportunity), exclusion(nullptr) {
exclusion_edge.start = opportunity.offset.inline_offset;
exclusion_edge.end = exclusion_edge.start + opportunity.size.inline_size;
}
@@ -18,14 +18,13 @@
NGEdge exclusion_edge)
: opportunity(opportunity),
exclusion_edge(exclusion_edge),
- combined_exclusion(nullptr) {}
+ exclusion(nullptr) {}
String NGLayoutOpportunityTreeNode::ToString() const {
- return String::format("Opportunity: '%s' Exclusion: '%s'",
- opportunity.ToString().ascii().data(),
- combined_exclusion
- ? combined_exclusion->ToString().ascii().data()
- : "null");
+ return String::format(
+ "Opportunity: '%s' Exclusion: '%s'",
+ opportunity.ToString().ascii().data(),
+ exclusion ? exclusion->ToString().ascii().data() : "null");
}
DEFINE_TRACE(NGLayoutOpportunityTreeNode) {
« no previous file with comments | « third_party/WebKit/Source/core/layout/ng/ng_layout_opportunity_tree_node.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698