Move m_lineBoxes and its getters down to LayoutBlockFlow.

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 21 matching lines @@
  * (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 "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 "core/style/ComputedStyleConstants.h"
 
 namespace blink {
 
 class BlockChildrenLayoutInfo;
 class ClipScope;
 class MarginInfo;
 class LineBreaker;
 class LineInfo;
@@ skipping 65 matching lines @@
     {
         return style()->isLeftToRightDirection() ? logicalLeftOffsetForLine(position, indentText, logicalHeight)
             : logicalWidth() - logicalRightOffsetForLine(position, indentText, logicalHeight);
     }
     LayoutUnit endOffsetForLine(LayoutUnit position, IndentTextOrNot indentText, LayoutUnit logicalHeight = LayoutUnit()) const
     {
         return !style()->isLeftToRightDirection() ? logicalLeftOffsetForLine(position, indentText, logicalHeight)
             : logicalWidth() - logicalRightOffsetForLine(position, indentText, logicalHeight);
     }
 
-    // FIXME-BLOCKFLOW: Move this into LayoutBlockFlow once there are no calls
-    // in LayoutBlock. http://crbug.com/393945, http://crbug.com/302024
-    using LayoutBlock::lineBoxes;
-    using LayoutBlock::firstLineBox;
-    using LayoutBlock::lastLineBox;
-    using LayoutBlock::firstRootBox;
-    using LayoutBlock::lastRootBox;
+    const LineBoxList& lineBoxes() const { return m_lineBoxes; }
+    LineBoxList* lineBoxes() { return &m_lineBoxes; }
+    InlineFlowBox* firstLineBox() const { return m_lineBoxes.firstLineBox(); }
+    InlineFlowBox* lastLineBox() const { return m_lineBoxes.lastLineBox(); }
+    RootInlineBox* firstRootBox() const { return static_cast<RootInlineBox*>(firstLineBox()); }
+    RootInlineBox* lastRootBox() const { return static_cast<RootInlineBox*>(lastLineBox()); }
 
     LayoutUnit logicalLeftSelectionOffset(const LayoutBlock* rootBlock, LayoutUnit position) const override;
     LayoutUnit logicalRightSelectionOffset(const LayoutBlock* rootBlock, LayoutUnit position) const override;
 
     RootInlineBox* createAndAppendRootInlineBox();
 
     // Return the number of lines in *this* block flow. Does not recurse into block flow children.
     // Will start counting from the first line, and stop counting right after |stopRootInlineBox|,
     // if specified.
     int lineCount(const RootInlineBox* stopRootInlineBox = nullptr) const;
@@ skipping 457 matching lines @@
 
     LayoutUnit adjustBlockChildForPagination(LayoutUnit logicalTop, LayoutBox& child, BlockChildrenLayoutInfo&, bool atBeforeSideOfBlock);
     // Computes a deltaOffset value that put a line at the top of the next page if it doesn't fit on the current page.
     void adjustLinePositionForPagination(RootInlineBox&, LayoutUnit& deltaOffset);
     // If the child is unsplittable and can't fit on the current page, return the top of the next page/column.
     LayoutUnit adjustForUnsplittableChild(LayoutBox&, LayoutUnit logicalOffset) const;
 
     // Used to store state between styleWillChange and styleDidChange
     static bool s_canPropagateFloatIntoSibling;
 
+    LineBoxList m_lineBoxes; // All of the root line boxes created for this block flow.  For example, <div>Hello<br>world.</div> will have two total lines for the <div>.
+
     LayoutBlockFlowRareData& ensureRareData();
 
     LayoutUnit m_paintInvalidationLogicalTop;
     LayoutUnit m_paintInvalidationLogicalBottom;
 
     bool isSelfCollapsingBlock() const override;
     bool checkIfIsSelfCollapsingBlock() const;
 
 protected:
     OwnPtr<LayoutBlockFlowRareData> m_rareData;
@@ skipping 43 matching lines @@
 
 // END METHODS DEFINED IN LayoutBlockFlowLine
 
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
 
 } // namespace blink
 
 #endif // LayoutBlockFlow_h