[LayoutNG] Move NGInlineNode data to NGInlineNodeData.

third_party/WebKit/Source/core/layout/LayoutBlockFlow.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003-2013 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ skipping 18 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef LayoutBlockFlow_h
 #define LayoutBlockFlow_h
 
+#include <memory>
 #include "core/CoreExport.h"
 #include "core/layout/FloatingObjects.h"
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/api/LineLayoutItem.h"
 #include "core/layout/line/LineBoxList.h"
 #include "core/layout/line/RootInlineBox.h"
 #include "core/layout/line/TrailingObjects.h"
-#include <memory>
+#include "core/layout/ng/inline/ng_inline_node_data.h"
 
 namespace blink {
 
 class BlockChildrenLayoutInfo;
 class MarginInfo;
 class LayoutInline;
 class LineInfo;
 class LineLayoutState;
 class LineWidth;
 class LayoutMultiColumnFlowThread;
@@ skipping 219 matching lines @@
   }
 
   LayoutMultiColumnFlowThread* MultiColumnFlowThread() const {
     return rare_data_ ? rare_data_->multi_column_flow_thread_ : 0;
   }
   void ResetMultiColumnFlowThread() {
     if (rare_data_)
       rare_data_->multi_column_flow_thread_ = nullptr;
   }
 
+  NGInlineNodeData& GetNGInlineNodeData() const {
+    DCHECK(rare_data_);
+    DCHECK(rare_data_->ng_inline_node_data_);
+    return *rare_data_->ng_inline_node_data_.get();
+  }
+
+  void InitNGInlineNodeData() {
+    LayoutBlockFlowRareData& rare_data = EnsureRareData();
+    if (!rare_data.ng_inline_node_data_)
+      rare_data.ng_inline_node_data_ = WTF::WrapUnique(new NGInlineNodeData);

[kojii, 2017/04/26 02:21:17]

nit: MakeUnique()?
https://sites.google.com/a/chromium.org/dev/developers/coding-style/cpp-dos-a...

[ikilpatrick, 2017/05/01 20:46:34]

Done.

+  }
+
   void AddOverflowFromInlineChildren();
 
   // FIXME: This should be const to avoid a const_cast, but can modify child
   // dirty bits and LayoutTextCombine.
   void ComputeInlinePreferredLogicalWidths(LayoutUnit& min_logical_width,
                                            LayoutUnit& max_logical_width);
 
   bool AllowsPaginationStrut() const;
   // Pagination strut caused by the first line or child block inside this
   // block-level object.
@@ skipping 394 matching lines @@
     WTF_MAKE_NONCOPYABLE(LayoutBlockFlowRareData);
     USING_FAST_MALLOC(LayoutBlockFlowRareData);
 
    public:
     LayoutBlockFlowRareData(const LayoutBlockFlow* block)
         : margins_(PositiveMarginBeforeDefault(block),
                    NegativeMarginBeforeDefault(block),
                    PositiveMarginAfterDefault(block),
                    NegativeMarginAfterDefault(block)),
           multi_column_flow_thread_(nullptr),
+          ng_inline_node_data_(nullptr),
           break_before_(static_cast<unsigned>(EBreakBetween::kAuto)),
           break_after_(static_cast<unsigned>(EBreakBetween::kAuto)),
           line_break_to_avoid_widow_(-1),
           did_break_at_line_to_avoid_widow_(false),
           discard_margin_before_(false),
           discard_margin_after_(false) {}
 
     static LayoutUnit PositiveMarginBeforeDefault(
         const LayoutBlockFlow* block) {
       return block->MarginBefore().ClampNegativeToZero();
     }
     static LayoutUnit NegativeMarginBeforeDefault(
         const LayoutBlockFlow* block) {
       return (-block->MarginBefore()).ClampNegativeToZero();
     }
     static LayoutUnit PositiveMarginAfterDefault(const LayoutBlockFlow* block) {
       return block->MarginAfter().ClampNegativeToZero();
     }
     static LayoutUnit NegativeMarginAfterDefault(const LayoutBlockFlow* block) {
       return (-block->MarginAfter()).ClampNegativeToZero();
     }
 
     MarginValues margins_;
     LayoutUnit pagination_strut_propagated_from_child_;
 
     LayoutUnit first_forced_break_offset_;
 
     LayoutMultiColumnFlowThread* multi_column_flow_thread_;
+    std::unique_ptr<NGInlineNodeData> ng_inline_node_data_;
 
     unsigned break_before_ : 4;
     unsigned break_after_ : 4;
     int line_break_to_avoid_widow_;
     bool did_break_at_line_to_avoid_widow_ : 1;
     bool discard_margin_before_ : 1;
     bool discard_margin_after_ : 1;
   };
 
   const FloatingObjects* GetFloatingObjects() const {
@@ skipping 236 matching lines @@
   void PositionDialog();
 
   // END METHODS DEFINED IN LayoutBlockFlowLine
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, IsLayoutBlockFlow());
 
 }  // namespace blink
 
 #endif  // LayoutBlockFlow_h