diff options
Diffstat (limited to 'Source/WebCore/rendering/RenderBox.h')
-rw-r--r-- | Source/WebCore/rendering/RenderBox.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/WebCore/rendering/RenderBox.h b/Source/WebCore/rendering/RenderBox.h index ed70a94b8..af3c4624a 100644 --- a/Source/WebCore/rendering/RenderBox.h +++ b/Source/WebCore/rendering/RenderBox.h @@ -299,10 +299,10 @@ public: virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&, bool* offsetDependsOnPoint = 0) const; - LayoutUnit computeBorderBoxLogicalWidth(LayoutUnit width) const; - LayoutUnit computeBorderBoxLogicalHeight(LayoutUnit height) const; - LayoutUnit computeContentBoxLogicalWidth(LayoutUnit width) const; - LayoutUnit computeContentBoxLogicalHeight(LayoutUnit height) const; + LayoutUnit adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit width) const; + LayoutUnit adjustBorderBoxLogicalHeightForBoxSizing(LayoutUnit height) const; + LayoutUnit adjustContentBoxLogicalWidthForBoxSizing(LayoutUnit width) const; + LayoutUnit adjustContentBoxLogicalHeightForBoxSizing(LayoutUnit height) const; virtual void borderFitAdjust(LayoutRect&) const { } // Shrink the box in which the border paints if border-fit is set. @@ -364,8 +364,8 @@ public: LayoutUnit containingBlockAvailableLineWidthInRegion(RenderRegion*, LayoutUnit offsetFromLogicalTopOfFirstPage) const; LayoutUnit perpendicularContainingBlockLogicalHeight() const; - virtual void computeLogicalWidth(); - virtual void computeLogicalHeight(); + virtual void updateLogicalWidth(); + virtual void updateLogicalHeight(); void computeLogicalHeight(LogicalExtentComputedValues&) const; RenderBoxRegionInfo* renderBoxRegionInfo(RenderRegion*, LayoutUnit offsetFromLogicalTopOfFirstPage, RenderBoxRegionInfoFlags = CacheRenderBoxRegionInfo) const; @@ -449,11 +449,11 @@ public: bool tryLayoutDoingPositionedMovementOnly() { LayoutUnit oldWidth = width(); - computeLogicalWidth(); + updateLogicalWidth(); // If we shrink to fit our width may have changed, so we still need full layout. if (oldWidth != width()) return false; - computeLogicalHeight(); + updateLogicalHeight(); return true; } |