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

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

Issue 2845493002: [LayoutNG] Fix empty inlines to influence the used line height (Closed)
Patch Set: Mark failure in a test in CSS2/normal-flow Created 3 years, 8 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/inline/ng_line_box_fragment_builder.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/inline/ng_line_box_fragment_builder.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_line_box_fragment_builder.cc b/third_party/WebKit/Source/core/layout/ng/inline/ng_line_box_fragment_builder.cc
index baeab067e48f6e7641afdcb2b5b3a34988e74dd7..e972c2c052494d9204933f81ce05ad7b9c17798f 100644
--- a/third_party/WebKit/Source/core/layout/ng/inline/ng_line_box_fragment_builder.cc
+++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_line_box_fragment_builder.cc
@@ -13,10 +13,8 @@
namespace blink {
-NGLineBoxFragmentBuilder::NGLineBoxFragmentBuilder(
- NGInlineNode* node,
- const NGLineHeightMetrics& metrics)
- : direction_(TextDirection::kLtr), node_(node), metrics_(metrics) {}
+NGLineBoxFragmentBuilder::NGLineBoxFragmentBuilder(NGInlineNode* node)
+ : direction_(TextDirection::kLtr), node_(node) {}
NGLineBoxFragmentBuilder& NGLineBoxFragmentBuilder::SetDirection(
TextDirection direction) {
@@ -51,9 +49,8 @@ void NGLineBoxFragmentBuilder::MoveChildrenInBlockDirection(LayoutUnit delta,
offsets_[index].block_offset += delta;
}
-void NGLineBoxFragmentBuilder::UniteMetrics(
- const NGLineHeightMetrics& metrics) {
- metrics_.Unite(metrics);
+void NGLineBoxFragmentBuilder::SetMetrics(const NGLineHeightMetrics& metrics) {
+ metrics_ = metrics;
}
void NGLineBoxFragmentBuilder::SetBreakToken(
« no previous file with comments | « third_party/WebKit/Source/core/layout/ng/inline/ng_line_box_fragment_builder.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698