diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
| commit | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (patch) | |
| tree | 87f4fd2c7b38db320079a5de8877890d2ca3c485 /Source/WebCore/rendering/RenderBox.cpp | |
| parent | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (diff) | |
| download | qtwebkit-1b914638db989aaa98631a1c1e02c7b2d44805d8.tar.gz | |
Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)
New snapshot to include QDeclarative* -> QQml* build fixes
Diffstat (limited to 'Source/WebCore/rendering/RenderBox.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderBox.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp index b906ec94d..199deb6b2 100644 --- a/Source/WebCore/rendering/RenderBox.cpp +++ b/Source/WebCore/rendering/RenderBox.cpp @@ -256,11 +256,6 @@ void RenderBox::willBeDestroyed() if (styleToUse) { if (RenderView* view = this->view()) { if (FrameView* frameView = view->frameView()) { - // If this renderer is owning renderer for the FrameView's custom scrollbars, - // we need to clear it from the scrollbar. See webkit bug 64737. - if (styleToUse->hasPseudoStyle(SCROLLBAR)) - frameView->clearOwningRendererForCustomScrollbars(this); - if (styleToUse->position() == FixedPosition) frameView->removeFixedObject(); } @@ -3912,6 +3907,16 @@ LayoutRect RenderBox::layoutOverflowRectForPropagation(RenderStyle* parentStyle) return rect; } +LayoutUnit RenderBox::offsetLeft() const +{ + return offsetTopLeft(topLeftLocation()).x(); +} + +LayoutUnit RenderBox::offsetTop() const +{ + return offsetTopLeft(topLeftLocation()).y(); +} + LayoutPoint RenderBox::flipForWritingModeForChild(const RenderBox* child, const LayoutPoint& point) const { if (!style()->isFlippedBlocksWritingMode()) |