Index: third_party/WebKit/Source/core/layout/LayoutBox.h |
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.h b/third_party/WebKit/Source/core/layout/LayoutBox.h |
index a208fbd3185f14cafd35768cd79f9c65d054cb79..b907f1143f55ecead40e98dc9afe91ffd5e145c2 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutBox.h |
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.h |
@@ -863,7 +863,7 @@ protected: |
virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const; |
bool computeBackgroundIsKnownToBeObscured() const override; |
- void computePositionedLogicalWidth(LogicalExtentComputedValues&) const; |
+ virtual void computePositionedLogicalWidth(LogicalExtentComputedValues&) const; |
LayoutUnit computeIntrinsicLogicalWidthUsing(const Length& logicalWidthLength, LayoutUnit availableLogicalWidth, LayoutUnit borderAndPadding) const; |
virtual LayoutUnit computeIntrinsicLogicalContentHeightUsing(const Length& logicalHeightLength, LayoutUnit intrinsicContentHeight, LayoutUnit borderAndPadding) const; |
@@ -888,6 +888,14 @@ protected: |
bool hasNonCompositedScrollbars() const final; |
void excludeScrollbars(LayoutRect&, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize) const; |
+ LayoutUnit containingBlockLogicalWidthForPositioned(const LayoutBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode = true) const; |
+ LayoutUnit containingBlockLogicalHeightForPositioned(const LayoutBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode = true) const; |
+ |
+ static void computeBlockStaticDistance(Length& logicalTop, Length& logicalBottom, const LayoutBox* child, const LayoutBoxModelObject* containerBlock); |
+ static void computeInlineStaticDistance(Length& logicalLeft, Length& logicalRight, const LayoutBox* child, const LayoutBoxModelObject* containerBlock, LayoutUnit containerLogicalWidth); |
+ static void computeLogicalLeftPositionedOffset(LayoutUnit& logicalLeftPos, const LayoutBox* child, LayoutUnit logicalWidthValue, const LayoutBoxModelObject* containerBlock, LayoutUnit containerLogicalWidth); |
+ static void computeLogicalTopPositionedOffset(LayoutUnit& logicalTopPos, const LayoutBox* child, LayoutUnit logicalHeightValue, const LayoutBoxModelObject* containerBlock, LayoutUnit containerLogicalHeight); |
+ |
private: |
bool mustInvalidateBackgroundOrBorderPaintOnHeightChange() const; |
bool mustInvalidateBackgroundOrBorderPaintOnWidthChange() const; |
@@ -907,10 +915,7 @@ private: |
bool stretchesToViewportInQuirksMode() const; |
bool skipContainingBlockForPercentHeightCalculation(const LayoutBox* containingBlock) const; |
- LayoutUnit containingBlockLogicalWidthForPositioned(const LayoutBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode = true) const; |
- LayoutUnit containingBlockLogicalHeightForPositioned(const LayoutBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode = true) const; |
- |
- void computePositionedLogicalHeight(LogicalExtentComputedValues&) const; |
+ virtual void computePositionedLogicalHeight(LogicalExtentComputedValues&) const; |
void computePositionedLogicalWidthUsing(SizeType, Length logicalWidth, const LayoutBoxModelObject* containerBlock, TextDirection containerDirection, |
LayoutUnit containerLogicalWidth, LayoutUnit bordersPlusPadding, |
const Length& logicalLeft, const Length& logicalRight, const Length& marginLogicalLeft, |
@@ -920,9 +925,6 @@ private: |
const Length& logicalTop, const Length& logicalBottom, const Length& marginLogicalTop, |
const Length& marginLogicalBottom, LogicalExtentComputedValues&) const; |
- void computePositionedLogicalHeightReplaced(LogicalExtentComputedValues&) const; |
- void computePositionedLogicalWidthReplaced(LogicalExtentComputedValues&) const; |
- |
LayoutUnit fillAvailableMeasure(LayoutUnit availableLogicalWidth) const; |
LayoutUnit fillAvailableMeasure(LayoutUnit availableLogicalWidth, LayoutUnit& marginStart, LayoutUnit& marginEnd) const; |