diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 10:36:58 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 10:36:58 +0200 |
| commit | b1e9e47fa11f608ae16bc07f97a2acf95bf80272 (patch) | |
| tree | c88c45e80c9c44506e7cdf9a3bb39ebf82a8cd5b /Source/WebCore/rendering/RenderBoxModelObject.cpp | |
| parent | be01689f43cf6882cf670d33df49ead1f570c53a (diff) | |
| download | qtwebkit-b1e9e47fa11f608ae16bc07f97a2acf95bf80272.tar.gz | |
Imported WebKit commit 499c84c99aa98e9870fa7eaa57db476c6d160d46 (http://svn.webkit.org/repository/webkit/trunk@119200)
Weekly update :). Particularly relevant changes for Qt are the use of the WebCore image decoders and direct usage
of libpng/libjpeg if available in the system.
Diffstat (limited to 'Source/WebCore/rendering/RenderBoxModelObject.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderBoxModelObject.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebCore/rendering/RenderBoxModelObject.cpp b/Source/WebCore/rendering/RenderBoxModelObject.cpp index 1625f075b..0cbf9913f 100644 --- a/Source/WebCore/rendering/RenderBoxModelObject.cpp +++ b/Source/WebCore/rendering/RenderBoxModelObject.cpp @@ -515,7 +515,7 @@ LayoutSize RenderBoxModelObject::relativePositionOffset() const return offset; } -LayoutPoint RenderBoxModelObject::offsetTopLeft(const LayoutPoint& startPoint) const +LayoutPoint RenderBoxModelObject::adjustedPositionRelativeToOffsetParent(const LayoutPoint& startPoint) const { // If the element is the HTML body element or does not have an associated box // return 0 and stop this algorithm. @@ -553,15 +553,15 @@ LayoutPoint RenderBoxModelObject::offsetTopLeft(const LayoutPoint& startPoint) c LayoutUnit RenderBoxModelObject::offsetLeft() const { // Note that RenderInline and RenderBox override this to pass a different - // startPoint to offsetTopLeft. - return offsetTopLeft(LayoutPoint()).x(); + // startPoint to adjustedPositionRelativeToOffsetParent. + return adjustedPositionRelativeToOffsetParent(LayoutPoint()).x(); } LayoutUnit RenderBoxModelObject::offsetTop() const { // Note that RenderInline and RenderBox override this to pass a different - // startPoint to offsetTopLeft. - return offsetTopLeft(LayoutPoint()).y(); + // startPoint to adjustedPositionRelativeToOffsetParent. + return adjustedPositionRelativeToOffsetParent(LayoutPoint()).y(); } int RenderBoxModelObject::pixelSnappedOffsetWidth() const |