diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
| commit | 88a04ac016f57c2d78e714682445dff2e7db4ade (patch) | |
| tree | a48ca81ee3b29953121308168db22532d5b57fe2 /Source/WebCore/rendering/RenderBlockLineLayout.cpp | |
| parent | 284837daa07b29d6a63a748544a90b1f5842ac5c (diff) | |
| download | qtwebkit-88a04ac016f57c2d78e714682445dff2e7db4ade.tar.gz | |
Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c (http://svn.webkit.org/repository/webkit/trunk@128206)
This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection
and allow for further simplifications in the future
Diffstat (limited to 'Source/WebCore/rendering/RenderBlockLineLayout.cpp')
| -rwxr-xr-x | Source/WebCore/rendering/RenderBlockLineLayout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/RenderBlockLineLayout.cpp b/Source/WebCore/rendering/RenderBlockLineLayout.cpp index c0c3404ad..fe6694437 100755 --- a/Source/WebCore/rendering/RenderBlockLineLayout.cpp +++ b/Source/WebCore/rendering/RenderBlockLineLayout.cpp @@ -1297,8 +1297,8 @@ void RenderBlock::layoutRunsAndFloatsInRange(LineLayoutState& layoutState, Inlin #if ENABLE(CSS_EXCLUSIONS) WrapShapeInfo* wrapShapeInfo = this->wrapShapeInfo(); // Move to the top of the shape inside to begin layout - if (wrapShapeInfo && logicalHeight() < wrapShapeInfo->shapeTop()) - setLogicalHeight(wrapShapeInfo->shapeTop()); + if (wrapShapeInfo && logicalHeight() < wrapShapeInfo->shapeLogicalTop()) + setLogicalHeight(wrapShapeInfo->shapeLogicalTop()); #endif while (!end.atEnd()) { |