diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-23 17:03:15 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-23 17:03:15 +0200 |
| commit | a73d1c176f2f3e0458861de8590dc20321a501ae (patch) | |
| tree | d897fc5974797c3cb300d7f5916f258df765401f /Source/WebCore/rendering/RenderLayer.cpp | |
| parent | c311cf639cc1d6570d67b0a80a8ba04dc992a658 (diff) | |
| download | qtwebkit-a73d1c176f2f3e0458861de8590dc20321a501ae.tar.gz | |
Imported WebKit commit a5ae8a56a48e44ebfb9b81aaa5488affaffdb175 (http://svn.webkit.org/repository/webkit/trunk@126420)
New snapshot with OS X 10.6 build fix
Diffstat (limited to 'Source/WebCore/rendering/RenderLayer.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderLayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp index fe75262c8..661d0eb08 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp @@ -4777,7 +4777,7 @@ bool RenderLayer::shouldBeNormalFlowOnly() const || renderer()->isVideo() || renderer()->isEmbeddedObject() || renderer()->isRenderIFrame() - || renderer()->style()->specifiesColumns()) + || (renderer()->style()->specifiesColumns() && !isRootLayer())) && !renderer()->isOutOfFlowPositioned() && !renderer()->isRelPositioned() && !renderer()->hasTransform() |