From dd91e772430dc294e3bf478c119ef8d43c0a3358 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 12 Mar 2012 14:11:15 +0100 Subject: Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422) This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API. --- Source/WebCore/rendering/RenderScrollbar.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/WebCore/rendering/RenderScrollbar.cpp') diff --git a/Source/WebCore/rendering/RenderScrollbar.cpp b/Source/WebCore/rendering/RenderScrollbar.cpp index 25eb5a7b3..6f6fd53ea 100644 --- a/Source/WebCore/rendering/RenderScrollbar.cpp +++ b/Source/WebCore/rendering/RenderScrollbar.cpp @@ -202,7 +202,7 @@ void RenderScrollbar::updateScrollbarParts(bool destroy) } if (newThickness != oldThickness) { - setFrameRect(IntRect(x(), y(), isHorizontal ? width() : newThickness, isHorizontal ? newThickness : height())); + setFrameRect(IntRect(location(), IntSize(isHorizontal ? width() : newThickness, isHorizontal ? newThickness : height()))); if (RenderBox* box = owningRenderer()) box->setChildNeedsLayout(true); } @@ -297,7 +297,7 @@ IntRect RenderScrollbar::buttonRect(ScrollbarPart partType) bool isHorizontal = orientation() == HorizontalScrollbar; if (partType == BackButtonStartPart) - return IntRect(x(), y(), isHorizontal ? partRenderer->width() : width(), isHorizontal ? height() : partRenderer->height()); + return IntRect(location(), IntSize(isHorizontal ? partRenderer->width() : width(), isHorizontal ? height() : partRenderer->height())); if (partType == ForwardButtonEndPart) return IntRect(isHorizontal ? x() + width() - partRenderer->width() : x(), @@ -355,10 +355,10 @@ IntRect RenderScrollbar::trackPieceRectWithMargins(ScrollbarPart partType, const IntRect rect = oldRect; if (orientation() == HorizontalScrollbar) { rect.setX(rect.x() + partRenderer->marginLeft()); - rect.setWidth(rect.width() - (partRenderer->marginLeft() + partRenderer->marginRight())); + rect.setWidth(rect.width() - partRenderer->marginWidth()); } else { rect.setY(rect.y() + partRenderer->marginTop()); - rect.setHeight(rect.height() - (partRenderer->marginTop() + partRenderer->marginBottom())); + rect.setHeight(rect.height() - partRenderer->marginHeight()); } return rect; } -- cgit v1.2.1