| Index: sky/engine/core/rendering/RenderBox.h
|
| diff --git a/sky/engine/core/rendering/RenderBox.h b/sky/engine/core/rendering/RenderBox.h
|
| index 08bb657545529c1155abde548e5e90eaf8ace43a..4446622e158434ba253c9cf1e165bd6b1998d037 100644
|
| --- a/sky/engine/core/rendering/RenderBox.h
|
| +++ b/sky/engine/core/rendering/RenderBox.h
|
| @@ -100,8 +100,8 @@ public:
|
|
|
| // These represent your location relative to your container as a physical offset.
|
| // In layout related methods you almost always want the logical location (e.g. x() and y()).
|
| - LayoutUnit top() const { return topLeftLocation().y(); }
|
| - LayoutUnit left() const { return topLeftLocation().x(); }
|
| + LayoutUnit top() const { return location().y(); }
|
| + LayoutUnit left() const { return location().x(); }
|
|
|
| void setX(LayoutUnit x) { m_frameRect.setX(x); }
|
| void setY(LayoutUnit y) { m_frameRect.setY(y); }
|
| @@ -188,8 +188,7 @@ public:
|
| // For horizontal-tb and vertical-lr they will match physical directions, but for horizontal-bt and vertical-rl, the top/bottom and left/right
|
| // respectively are flipped when compared to their physical counterparts. For example minX is on the left in vertical-lr,
|
| // but it is on the right in vertical-rl.
|
| - LayoutRect noOverflowRect() const;
|
| - LayoutRect layoutOverflowRect() const { return m_overflow ? m_overflow->layoutOverflowRect() : noOverflowRect(); }
|
| + LayoutRect layoutOverflowRect() const { return m_overflow ? m_overflow->layoutOverflowRect() : paddingBoxRect(); }
|
| IntRect pixelSnappedLayoutOverflowRect() const { return pixelSnappedIntRect(layoutOverflowRect()); }
|
| LayoutSize maxLayoutOverflow() const { return LayoutSize(layoutOverflowRect().maxX(), layoutOverflowRect().maxY()); }
|
| LayoutUnit logicalLeftLayoutOverflow() const { return layoutOverflowRect().x(); }
|
| @@ -369,9 +368,6 @@ public:
|
|
|
| LayoutUnit containingBlockLogicalHeightForContent(AvailableLogicalHeightType) const;
|
|
|
| - LayoutUnit containingBlockAvailableLineWidth() const;
|
| - LayoutUnit perpendicularContainingBlockLogicalHeight() const;
|
| -
|
| virtual void updateLogicalWidth();
|
| virtual void updateLogicalHeight();
|
| virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const;
|
| @@ -387,8 +383,6 @@ public:
|
| // of a containing block). HTML4 buttons, <select>s, <input>s, legends, and floating/compact elements do this.
|
| bool sizesLogicalWidthToFitContent(const Length& logicalWidth) const;
|
|
|
| - LayoutUnit shrinkLogicalWidthToAvoidFloats(LayoutUnit childMarginStart, LayoutUnit childMarginEnd, const RenderBlockFlow* cb) const;
|
| -
|
| LayoutUnit computeLogicalWidthUsing(SizeType, const Length& logicalWidth, LayoutUnit availableLogicalWidth, const RenderBlock* containingBlock) const;
|
| LayoutUnit computeLogicalHeightUsing(const Length& height, LayoutUnit intrinsicContentHeight) const;
|
| LayoutUnit computeContentLogicalHeight(const Length& height, LayoutUnit intrinsicContentHeight) const;
|
| @@ -470,7 +464,7 @@ 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 isFlexItemIncludingDeprecated() const { return !isInline() && !isFloatingOrOutOfFlowPositioned() && parent() && parent()->isFlexibleBox(); }
|
| + bool isFlexItem() const { return !isInline() && !isFloatingOrOutOfFlowPositioned() && parent() && parent()->isFlexibleBox(); }
|
|
|
| virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
|
| virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
|
| @@ -478,15 +472,7 @@ public:
|
| virtual LayoutUnit offsetLeft() const override;
|
| virtual LayoutUnit offsetTop() const override;
|
|
|
| - // These represent your location relative to your container as a physical offset.
|
| - // In layout related methods you almost always want the logical location (e.g. x() and y()).
|
| - LayoutPoint topLeftLocation() const;
|
| - LayoutSize topLeftLocationOffset() const;
|
| -
|
| - LayoutRect logicalVisualOverflowRectForPropagation(RenderStyle*) const;
|
| - LayoutRect visualOverflowRectForPropagation(RenderStyle*) const;
|
| - LayoutRect logicalLayoutOverflowRectForPropagation(RenderStyle*) const;
|
| - LayoutRect layoutOverflowRectForPropagation(RenderStyle*) const;
|
| + LayoutRect layoutOverflowRectForPropagation() const;
|
|
|
| bool hasRenderOverflow() const { return m_overflow; }
|
| bool hasVisualOverflow() const { return m_overflow && !borderBoxRect().contains(m_overflow->visualOverflowRect()); }
|
|
|