[LayoutNG] Move NGInlineNode data to NGInlineNodeData.

third_party/WebKit/Source/core/layout/ng/inline/ng_inline_node.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 NGInlineNode_h
 #define NGInlineNode_h
 
 #include "core/CoreExport.h"
-#include "core/layout/LayoutBlockFlow.h"
 #include "core/layout/ng/inline/ng_inline_item.h"
+#include "core/layout/ng/inline/ng_inline_node_data.h"
+#include "core/layout/ng/layout_ng_block_flow.h"
 #include "core/layout/ng/ng_layout_input_node.h"
 #include "platform/heap/Handle.h"
 #include "platform/wtf/text/WTFString.h"
 
 namespace blink {
 
 class ComputedStyle;
 class LayoutBlockFlow;
+class LayoutNGBlockFlow;
 class LayoutObject;
 struct MinMaxContentSize;
 class NGConstraintSpace;
 class NGInlineItem;
 class NGInlineItemRange;
 class NGInlineItemsBuilder;
 class NGLayoutResult;
 
 // Represents an anonymous block box to be laid out, that contains consecutive
 // inline nodes and their descendants.
 class CORE_EXPORT NGInlineNode : public NGLayoutInputNode {
  public:
-  NGInlineNode(LayoutObject* start_inline, LayoutBlockFlow*);
+  NGInlineNode(LayoutObject* start_inline, LayoutNGBlockFlow*);
   ~NGInlineNode() override;
 
   LayoutBlockFlow* GetLayoutBlockFlow() const { return block_; }
   const ComputedStyle& Style() const override { return block_->StyleRef(); }
   NGLayoutInputNode* NextSibling() override;
 
   RefPtr<NGLayoutResult> Layout(NGConstraintSpace*, NGBreakToken*) override;
   LayoutObject* GetLayoutObject() override;
 
   // Computes the value of min-content and max-content for this anonymous block
   // box. min-content is the inline size when lines wrap at every break
   // opportunity, and max-content is when lines do not wrap at all.
   MinMaxContentSize ComputeMinMaxContentSize() override;
 
   // Copy fragment data of all lines to LayoutBlockFlow.
   void CopyFragmentDataToLayoutBox(const NGConstraintSpace&, NGLayoutResult*);
 
   // Instruct to re-compute |PrepareLayout| on the next layout.
   void InvalidatePrepareLayout();
 
-  const String& Text() const { return text_content_; }
+  const String& Text() const { return Data().text_content_; }
   StringView Text(unsigned start_offset, unsigned end_offset) const {
-    return StringView(text_content_, start_offset, end_offset - start_offset);
+    return StringView(Data().text_content_, start_offset,
+                      end_offset - start_offset);
   }
 
-  Vector<NGInlineItem>& Items() { return items_; }
-  const Vector<NGInlineItem>& Items() const { return items_; }
+  const Vector<NGInlineItem>& Items() const { return Data().items_; }
   NGInlineItemRange Items(unsigned start_index, unsigned end_index);
 
   void GetLayoutTextOffsets(Vector<unsigned, 32>*);
 
-  bool IsBidiEnabled() const { return is_bidi_enabled_; }
+  bool IsBidiEnabled() const { return Data().is_bidi_enabled_; }
 
   void AssertOffset(unsigned index, unsigned offset) const;
   void AssertEndOffset(unsigned index, unsigned offset) const;
 
   DECLARE_VIRTUAL_TRACE();
 
  protected:
   NGInlineNode();  // This constructor is only for testing.
 
   // Prepare inline and text content for layout. Must be called before
   // calling the Layout method.
   void PrepareLayout();
-  bool IsPrepareLayoutFinished() const { return !text_content_.IsNull(); }
+  bool IsPrepareLayoutFinished() const { return !Text().IsNull(); }
 
   void CollectInlines(LayoutObject* start, LayoutBlockFlow*);
   LayoutObject* CollectInlines(LayoutObject* start,
                                LayoutBlockFlow*,
                                NGInlineItemsBuilder*);
   void SegmentText();
   void ShapeText();
 
+  NGInlineNodeData& MutableData() { return block_->GetNGInlineNodeData(); }
+  const NGInlineNodeData& Data() const { return block_->GetNGInlineNodeData(); }
+
   LayoutObject* start_inline_;
-  LayoutBlockFlow* block_;
+  LayoutNGBlockFlow* block_;
   Member<NGLayoutInputNode> next_sibling_;
-
-  // Text content for all inline items represented by a single NGInlineNode
-  // instance. Encoded either as UTF-16 or latin-1 depending on content.
-  String text_content_;
-  Vector<NGInlineItem> items_;
-
-  // TODO(kojii): This should move to somewhere else when we move PrepareLayout
-  // to the correct place.
-  bool is_bidi_enabled_ = false;
 };
 
 inline void NGInlineNode::AssertOffset(unsigned index, unsigned offset) const {
-  items_[index].AssertOffset(offset);
+  Data().items_[index].AssertOffset(offset);
 }
 
 inline void NGInlineNode::AssertEndOffset(unsigned index,
                                           unsigned offset) const {
-  items_[index].AssertEndOffset(offset);
+  Data().items_[index].AssertEndOffset(offset);
 }
 
 DEFINE_TYPE_CASTS(NGInlineNode,
                   NGLayoutInputNode,
                   node,
                   node->IsInline(),
                   node.IsInline());
 
 }  // namespace blink
 
 #endif  // NGInlineNode_h