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

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

Issue 2750213002: [LayoutNG] Don't pass parent NGFragmentBuilder into NGLineBuilder. (Closed)
Patch Set: rebase fix. 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_inline_node.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc b/third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc
index 1137faaf66ef0b6706c0d2b182da31909d70d58c..e2cb0ba3ee3c9a4133baf6f0a8dbd584260c2939 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_inline_node.cc
@@ -263,17 +263,11 @@ void NGInlineNode::ShapeText() {
}
}
-RefPtr<NGLayoutResult> NGInlineNode::Layout(NGConstraintSpace*, NGBreakToken*) {
- ASSERT_NOT_REACHED();
- return nullptr;
-}
-
RefPtr<NGLayoutResult> NGInlineNode::Layout(NGConstraintSpace* constraint_space,
- NGFragmentBuilder* parent_builder,
- NGBreakToken* break_token) {
+ NGBreakToken*) {
// TODO(kojii): Invalidate PrepareLayout() more efficiently.
InvalidatePrepareLayout();
- NGLineBuilder line_builder(this, constraint_space, parent_builder);
+ NGLineBuilder line_builder(this, constraint_space);
Layout(&line_builder);
RefPtr<NGLayoutResult> result = line_builder.CreateFragments();
line_builder.CopyFragmentDataToLayoutBlockFlow();
@@ -301,7 +295,7 @@ MinMaxContentSize NGInlineNode::ComputeMinMaxContentSize() {
.SetTextDirection(BlockStyle()->direction())
.SetAvailableSize({LayoutUnit(), NGSizeIndefinite})
.ToConstraintSpace(writing_mode);
- NGLineBuilder line_builder(this, constraint_space.get(), nullptr);
+ NGLineBuilder line_builder(this, constraint_space.get());
Layout(&line_builder);
MinMaxContentSize sizes;
sizes.min_content = line_builder.MaxInlineSize();

Powered by Google App Engine
This is Rietveld 408576698