| Index: sky/engine/core/rendering/RenderBox.h
|
| diff --git a/sky/engine/core/rendering/RenderBox.h b/sky/engine/core/rendering/RenderBox.h
|
| index ed886f7cfd993705813098673169dfee2dde52ba..af18d70fd1357bd4e4a8baa362bc6ce6233cc957 100644
|
| --- a/sky/engine/core/rendering/RenderBox.h
|
| +++ b/sky/engine/core/rendering/RenderBox.h
|
| @@ -232,7 +232,7 @@ public:
|
|
|
| // More IE extensions. clientWidth and clientHeight represent the interior of an object
|
| // excluding border and scrollbar. clientLeft/Top are just the borderLeftWidth and borderTopWidth.
|
| - LayoutUnit clientLeft() const { return borderLeft() + (style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft() ? verticalScrollbarWidth() : 0); }
|
| + LayoutUnit clientLeft() const { return borderLeft(); }
|
| LayoutUnit clientTop() const { return borderTop(); }
|
| LayoutUnit clientWidth() const;
|
| LayoutUnit clientHeight() const;
|
| @@ -403,7 +403,7 @@ public:
|
| 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;
|
| - LayoutUnit computeContentAndScrollbarLogicalHeightUsing(const Length& height, LayoutUnit intrinsicContentHeight) const;
|
| + LayoutUnit computeContentLogicalHeightUsing(const Length& height, LayoutUnit intrinsicContentHeight) const;
|
| LayoutUnit computeReplacedLogicalWidthUsing(const Length& width) const;
|
| LayoutUnit computeReplacedLogicalWidthRespectingMinMaxWidth(LayoutUnit logicalWidth, ShouldComputePreferred = ComputeActual) const;
|
| LayoutUnit computeReplacedLogicalHeightUsing(const Length& height) const;
|
| @@ -425,10 +425,6 @@ public:
|
| LayoutUnit availableWidth() const { return availableLogicalWidth(); }
|
| LayoutUnit availableHeight() const { return availableLogicalHeight(IncludeMarginBorderPadding); }
|
|
|
| - virtual int verticalScrollbarWidth() const;
|
| - int horizontalScrollbarHeight() const;
|
| - int instrinsicScrollbarLogicalWidth() const;
|
| - int scrollbarLogicalHeight() const { return horizontalScrollbarHeight(); }
|
| virtual bool scroll(ScrollDirection, ScrollGranularity, float delta = 1);
|
| bool canBeScrolledAndHasScrollableArea() const;
|
| virtual bool canBeProgramaticallyScrolled() const;
|
|
|