[cleanup] Remove NGTextFragment, NGLineBoxFragment.

There should be no behaviour change.

Change-Id: Id7fddb20a0322b013d5467b4cf56e1863f98bc21
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2454847
Commit-Queue: Ian Kilpatrick <ikilpatrick@chromium.org>
Commit-Queue: Koji Ishii <kojii@chromium.org>
Auto-Submit: Ian Kilpatrick <ikilpatrick@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814553}

third_party/blink/renderer/core/layout/BUILD.gn

@@ -377,8 +377,6 @@ blink_core_sources("layout") {
     "ng/inline/ng_inline_node.h",
     "ng/inline/ng_inline_node_data.cc",
     "ng/inline/ng_inline_node_data.h",
-    "ng/inline/ng_line_box_fragment.cc",
-    "ng/inline/ng_line_box_fragment.h",
     "ng/inline/ng_line_box_fragment_builder.cc",
     "ng/inline/ng_line_box_fragment_builder.h",
     "ng/inline/ng_line_breaker.cc",
@@ -399,8 +397,6 @@ blink_core_sources("layout") {
     "ng/inline/ng_physical_text_fragment.h",
     "ng/inline/ng_ruby_utils.cc",
     "ng/inline/ng_ruby_utils.h",
-    "ng/inline/ng_text_fragment.cc",
-    "ng/inline/ng_text_fragment.h",
     "ng/inline/ng_text_fragment_builder.cc",
     "ng/inline/ng_text_fragment_builder.h",
     "ng/inline/ng_text_offset.cc",

third_party/blink/renderer/core/layout/layout_tree_as_text.cc

@@ -50,7 +50,6 @@
 #include "third_party/blink/renderer/core/layout/list_marker.h"
 #include "third_party/blink/renderer/core/layout/ng/inline/ng_fragment_item.h"
 #include "third_party/blink/renderer/core/layout/ng/inline/ng_inline_cursor.h"
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_text_fragment.h"
 #include "third_party/blink/renderer/core/layout/ng/list/layout_ng_list_item.h"
 #include "third_party/blink/renderer/core/layout/ng/ng_physical_box_fragment.h"
 #include "third_party/blink/renderer/core/layout/svg/layout_svg_image.h"
@@ -453,8 +452,8 @@ static void WriteTextFragment(WTF::TextStream& ts,
         DynamicTo<NGPhysicalTextFragment>(paint_fragment->PhysicalFragment());
     if (!physical_text_fragment)
       return;
-    const NGTextFragment fragment(paint_fragment->Style().GetWritingMode(),
-                                  *physical_text_fragment);
+    const NGFragment fragment(paint_fragment->Style().GetWritingMode(),
+                              *physical_text_fragment);
     WriteTextFragment(ts, paint_fragment->GetLayoutObject(),
                       paint_fragment->RectInContainerBlock(),
                       paint_fragment->Style(), physical_text_fragment->Text(),

third_party/blink/renderer/core/layout/ng/inline/ng_line_box_fragment.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 "third_party/blink/renderer/core/layout/ng/inline/ng_line_box_fragment.h"
-
-namespace blink {}  // namespace blink

third_party/blink/renderer/core/layout/ng/inline/ng_line_box_fragment.h

-// 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.
-
-#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_INLINE_NG_LINE_BOX_FRAGMENT_H_
-#define THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_INLINE_NG_LINE_BOX_FRAGMENT_H_
-
-#include "third_party/blink/renderer/core/core_export.h"
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_physical_line_box_fragment.h"
-#include "third_party/blink/renderer/core/layout/ng/ng_fragment.h"
-#include "third_party/blink/renderer/platform/text/writing_mode.h"
-#include "third_party/blink/renderer/platform/wtf/casting.h"
-
-namespace blink {
-
-class CORE_EXPORT NGLineBoxFragment final : public NGFragment {
- public:
-  NGLineBoxFragment(WritingMode writing_mode,
-                    const NGPhysicalLineBoxFragment& physical_fragment)
-      : NGFragment(writing_mode, physical_fragment) {}
-};
-
-template <>
-struct DowncastTraits<NGLineBoxFragment> {
-  static bool AllowFrom(const NGFragment& fragment) {
-    return fragment.Type() == NGPhysicalFragment::kFragmentLineBox;
-  }
-};
-
-}  // namespace blink
-
-#endif  // THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_INLINE_NG_LINE_BOX_FRAGMENT_H_

third_party/blink/renderer/core/layout/ng/inline/ng_text_fragment.cc

-// Copyright 2016 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 "third_party/blink/renderer/core/layout/ng/inline/ng_text_fragment.h"
-
-namespace blink {}  // namespace blink

third_party/blink/renderer/core/layout/ng/inline/ng_text_fragment.h

-// Copyright 2016 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.
-
-#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_INLINE_NG_TEXT_FRAGMENT_H_
-#define THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_INLINE_NG_TEXT_FRAGMENT_H_
-
-#include "third_party/blink/renderer/core/core_export.h"
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_physical_text_fragment.h"
-#include "third_party/blink/renderer/core/layout/ng/ng_fragment.h"
-
-namespace blink {
-
-class CORE_EXPORT NGTextFragment final : public NGFragment {
- public:
-  NGTextFragment(WritingMode writing_mode,
-                 const NGPhysicalTextFragment& physical_text_fragment)
-      : NGFragment(writing_mode, physical_text_fragment) {}
-};
-
-}  // namespace blink
-
-#endif  // THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_INLINE_NG_TEXT_FRAGMENT_H_

third_party/blink/renderer/core/layout/ng/ng_box_fragment.cc

@@ -23,7 +23,7 @@ FontHeight NGBoxFragment::BaselineMetrics(const NGLineBoxStrut& margins,
   }
 
   if (const base::Optional<LayoutUnit> baseline = Baseline()) {
-    FontHeight metrics = IsFlippedLinesWritingMode(GetWritingMode())
+    FontHeight metrics = IsFlippedLinesWritingMode(writing_mode_)
                              ? FontHeight(BlockSize() - *baseline, *baseline)
                              : FontHeight(*baseline, BlockSize() - *baseline);
 

third_party/blink/renderer/core/layout/ng/ng_box_fragment.h

@@ -22,7 +22,7 @@ class CORE_EXPORT NGBoxFragment final : public NGFragment {
       : NGFragment(writing_mode, physical_fragment), direction_(direction) {}
 
   base::Optional<LayoutUnit> FirstBaseline() const {
-    if (GetWritingMode() != physical_fragment_.Style().GetWritingMode())
+    if (writing_mode_ != physical_fragment_.Style().GetWritingMode())
       return base::nullopt;
 
     return To<NGPhysicalBoxFragment>(physical_fragment_).Baseline();
@@ -37,7 +37,7 @@ class CORE_EXPORT NGBoxFragment final : public NGFragment {
   //  - The fragment has no baseline.
   //  - The writing modes differ.
   base::Optional<LayoutUnit> Baseline() const {
-    if (GetWritingMode() != physical_fragment_.Style().GetWritingMode())
+    if (writing_mode_ != physical_fragment_.Style().GetWritingMode())
       return base::nullopt;
 
     if (auto last_baseline =
@@ -60,13 +60,13 @@ class CORE_EXPORT NGBoxFragment final : public NGFragment {
   NGBoxStrut Borders() const {
     const NGPhysicalBoxFragment& physical_box_fragment =
         To<NGPhysicalBoxFragment>(physical_fragment_);
-    return physical_box_fragment.Borders().ConvertToLogical(GetWritingMode(),
+    return physical_box_fragment.Borders().ConvertToLogical(writing_mode_,
                                                             direction_);
   }
   NGBoxStrut Padding() const {
     const NGPhysicalBoxFragment& physical_box_fragment =
         To<NGPhysicalBoxFragment>(physical_fragment_);
-    return physical_box_fragment.Padding().ConvertToLogical(GetWritingMode(),
+    return physical_box_fragment.Padding().ConvertToLogical(writing_mode_,
                                                             direction_);
   }
 

third_party/blink/renderer/core/layout/ng/ng_fragment.h

@@ -20,38 +20,26 @@ class CORE_EXPORT NGFragment {
  public:
   NGFragment(WritingMode writing_mode,
              const NGPhysicalFragment& physical_fragment)
-      : physical_fragment_(physical_fragment),
-        writing_mode_(static_cast<unsigned>(writing_mode)) {}
-
-  WritingMode GetWritingMode() const {
-    return static_cast<WritingMode>(writing_mode_);
-  }
+      : physical_fragment_(physical_fragment), writing_mode_(writing_mode) {}
 
   // Returns the border-box size.
   LayoutUnit InlineSize() const {
-    return GetWritingMode() == WritingMode::kHorizontalTb
+    return writing_mode_ == WritingMode::kHorizontalTb
                ? physical_fragment_.Size().width
                : physical_fragment_.Size().height;
   }
   LayoutUnit BlockSize() const {
-    return GetWritingMode() == WritingMode::kHorizontalTb
+    return writing_mode_ == WritingMode::kHorizontalTb
                ? physical_fragment_.Size().height
                : physical_fragment_.Size().width;
   }
   LogicalSize Size() const {
-    return physical_fragment_.Size().ConvertToLogical(
-        static_cast<WritingMode>(writing_mode_));
+    return physical_fragment_.Size().ConvertToLogical(writing_mode_);
   }
 
-  NGPhysicalFragment::NGFragmentType Type() const {
-    return physical_fragment_.Type();
-  }
-  const ComputedStyle& Style() const { return physical_fragment_.Style(); }
-
  protected:
   const NGPhysicalFragment& physical_fragment_;
-
-  unsigned writing_mode_ : 3;
+  const WritingMode writing_mode_;
 };
 
 }  // namespace blink

third_party/blink/renderer/core/paint/ng/ng_text_fragment_painter.cc

@@ -16,7 +16,6 @@
 #include "third_party/blink/renderer/core/layout/ng/inline/ng_inline_cursor.h"
 #include "third_party/blink/renderer/core/layout/ng/inline/ng_offset_mapping.h"
 #include "third_party/blink/renderer/core/layout/ng/inline/ng_physical_text_fragment.h"
-#include "third_party/blink/renderer/core/layout/ng/inline/ng_text_fragment.h"
 #include "third_party/blink/renderer/core/layout/ng/ng_physical_box_fragment.h"
 #include "third_party/blink/renderer/core/layout/ng/ng_text_decoration_offset.h"
 #include "third_party/blink/renderer/core/paint/document_marker_painter.h"