Index: third_party/WebKit/Source/core/layout/LayoutBlockFlow.h |
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h |
index 2566af799292e19f41a00825f27d8b45c4501308..8a8d3c83f546224f39b06b8bdad58c3630dfe511 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h |
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h |
@@ -418,6 +418,9 @@ private: |
void makeChildrenInlineIfPossible(); |
+ void makeChildrenNonInline(LayoutObject* insertionPoint = nullptr); |
+ void childBecameNonInline(LayoutObject* child) final; |
+ |
void updateLogicalWidthForAlignment(const ETextAlign&, const RootInlineBox*, BidiRun* trailingSpaceRun, LayoutUnit& logicalLeft, LayoutUnit& totalLogicalWidth, LayoutUnit& availableLogicalWidth, unsigned expansionOpportunityCount); |
void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight); |
@@ -613,6 +616,11 @@ protected: |
friend class MarginInfo; |
friend class LineWidth; // needs to know FloatingObject |
+ // LayoutRubyBase objects need to be able to split and merge, moving their children around |
+ // (calling makeChildrenNonInline). |
+ // TODO(mstensho): Try to get rid of this friendship. |
+ friend class LayoutRubyBase; |
+ |
// FIXME-BLOCKFLOW: These methods have implementations in |
// LayoutBlockFlowLine. They should be moved to the proper header once the |
// line layout code is separated from LayoutBlock and LayoutBlockFlow. |