[LayoutNG] Fix empty inlines to influence the used line height

third_party/WebKit/Source/core/layout/ng/inline/ng_line_box_fragment_builder.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/layout/ng/inline/ng_line_box_fragment_builder.h"
 
 #include "core/layout/ng/geometry/ng_logical_size.h"
 #include "core/layout/ng/inline/ng_inline_break_token.h"
 #include "core/layout/ng/inline/ng_inline_node.h"
 #include "core/layout/ng/inline/ng_physical_line_box_fragment.h"
 #include "core/layout/ng/ng_fragment.h"
 #include "platform/heap/Handle.h"
 
 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) {
   direction_ = direction;
   return *this;
 }
 
 NGLineBoxFragmentBuilder& NGLineBoxFragmentBuilder::SetInlineSize(
     LayoutUnit size) {
   inline_size_ = size;
@@ skipping 14 matching lines @@
     offset.block_offset += delta;
 }
 
 void NGLineBoxFragmentBuilder::MoveChildrenInBlockDirection(LayoutUnit delta,
                                                             unsigned start,
                                                             unsigned end) {
   for (unsigned index = start; index < end; index++)
     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(
     RefPtr<NGInlineBreakToken> break_token) {
   break_token_ = std::move(break_token);
 }
 
 RefPtr<NGPhysicalLineBoxFragment>
 NGLineBoxFragmentBuilder::ToLineBoxFragment() {
   DCHECK_EQ(offsets_.size(), children_.size());
@@ skipping 10 matching lines @@
         writing_mode, direction_, physical_size, child->Size()));
   }
 
   return AdoptRef(new NGPhysicalLineBoxFragment(
       physical_size, children_, metrics_,
       break_token_ ? std::move(break_token_)
                    : NGInlineBreakToken::Create(node_)));
 }
 
 }  // namespace blink