| Index: sky/engine/core/rendering/RenderBox.h
|
| diff --git a/sky/engine/core/rendering/RenderBox.h b/sky/engine/core/rendering/RenderBox.h
|
| index 85eb7d019fb620b75eda8dccb0cb2de2a90e46a1..43a7a3cc71714001387dd7e57c1df3f158b2c24e 100644
|
| --- a/sky/engine/core/rendering/RenderBox.h
|
| +++ b/sky/engine/core/rendering/RenderBox.h
|
| @@ -391,7 +391,6 @@ public:
|
|
|
| virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override;
|
| virtual void mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const override;
|
| - virtual void invalidatePaintForOverhangingFloats(bool paintAllDescendants);
|
|
|
| virtual LayoutUnit containingBlockLogicalWidthForContent() const override;
|
| LayoutUnit containingBlockLogicalHeightForContent(AvailableLogicalHeightType) const;
|
| @@ -506,7 +505,6 @@ public:
|
| virtual int firstLineBoxBaseline() const { return -1; }
|
| virtual int inlineBlockBaseline(LineDirectionMode) const { return -1; } // Returns -1 if we should skip this box when computing the baseline of an inline-block.
|
|
|
| - bool shrinkToAvoidFloats() const;
|
| virtual bool avoidsFloats() const;
|
|
|
| bool isFlexItemIncludingDeprecated() const { return !isInline() && !isFloatingOrOutOfFlowPositioned() && parent() && parent()->isFlexibleBox(); }
|
| @@ -665,7 +663,6 @@ private:
|
| void computePositionedLogicalWidthReplaced(LogicalExtentComputedValues&) const;
|
|
|
| LayoutUnit fillAvailableMeasure(LayoutUnit availableLogicalWidth) const;
|
| - LayoutUnit fillAvailableMeasure(LayoutUnit availableLogicalWidth, LayoutUnit& marginStart, LayoutUnit& marginEnd) const;
|
|
|
| virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const;
|
|
|
|
|