| 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 49b04cd0ea746d617c0d4040726f8e4458d927f8..b737001fb829c76a3479175dce47bdf1b6f29c5c 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 @@ namespace blink {
|
|
|
| NGLayoutOpportunityTreeNode::NGLayoutOpportunityTreeNode(
|
| const NGLogicalRect opportunity)
|
| - : opportunity(opportunity), exclusion(nullptr) {
|
| + : opportunity(opportunity), combined_exclusion(nullptr) {
|
| exclusion_edge.start = opportunity.offset.inline_offset;
|
| exclusion_edge.end = exclusion_edge.start + opportunity.size.inline_size;
|
| }
|
| @@ -18,13 +18,14 @@ NGLayoutOpportunityTreeNode::NGLayoutOpportunityTreeNode(
|
| NGEdge exclusion_edge)
|
| : opportunity(opportunity),
|
| exclusion_edge(exclusion_edge),
|
| - exclusion(nullptr) {}
|
| + combined_exclusion(nullptr) {}
|
|
|
| String NGLayoutOpportunityTreeNode::ToString() const {
|
| - return String::format(
|
| - "Opportunity: '%s' Exclusion: '%s'",
|
| - opportunity.ToString().ascii().data(),
|
| - exclusion ? exclusion->ToString().ascii().data() : "null");
|
| + return String::format("Opportunity: '%s' Exclusion: '%s'",
|
| + opportunity.ToString().ascii().data(),
|
| + combined_exclusion
|
| + ? combined_exclusion->ToString().ascii().data()
|
| + : "null");
|
| }
|
|
|
| DEFINE_TRACE(NGLayoutOpportunityTreeNode) {
|
|
|