From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- Source/WebCore/rendering/LayoutState.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'Source/WebCore/rendering/LayoutState.cpp') diff --git a/Source/WebCore/rendering/LayoutState.cpp b/Source/WebCore/rendering/LayoutState.cpp index 485d91775..28a8ffbea 100644 --- a/Source/WebCore/rendering/LayoutState.cpp +++ b/Source/WebCore/rendering/LayoutState.cpp @@ -39,8 +39,8 @@ LayoutState::LayoutState(LayoutState* prev, RenderBox* renderer, const LayoutSiz : m_columnInfo(columnInfo) , m_lineGrid(0) , m_next(prev) -#if ENABLE(CSS_EXCLUSIONS) - , m_exclusionShapeInsideInfo(0) +#if ENABLE(CSS_SHAPES) + , m_shapeInsideInfo(0) #endif #ifndef NDEBUG , m_renderer(renderer) @@ -110,11 +110,12 @@ LayoutState::LayoutState(LayoutState* prev, RenderBox* renderer, const LayoutSiz if (!m_columnInfo) m_columnInfo = m_next->m_columnInfo; -#if ENABLE(CSS_EXCLUSIONS) +#if ENABLE(CSS_SHAPES) if (renderer->isRenderBlock()) { - m_exclusionShapeInsideInfo = toRenderBlock(renderer)->exclusionShapeInsideInfo(); - if (!m_exclusionShapeInsideInfo) - m_exclusionShapeInsideInfo = m_next->m_exclusionShapeInsideInfo; + const RenderBlock* renderBlock = toRenderBlock(renderer); + m_shapeInsideInfo = renderBlock->shapeInsideInfo(); + if (!m_shapeInsideInfo && m_next->m_shapeInsideInfo && renderBlock->allowsShapeInsideInfoSharing()) + m_shapeInsideInfo = m_next->m_shapeInsideInfo; } #endif @@ -147,8 +148,8 @@ LayoutState::LayoutState(RenderObject* root) , m_columnInfo(0) , m_lineGrid(0) , m_next(0) -#if ENABLE(CSS_EXCLUSIONS) - , m_exclusionShapeInsideInfo(0) +#if ENABLE(CSS_SHAPES) + , m_shapeInsideInfo(0) #endif , m_pageLogicalHeight(0) #ifndef NDEBUG @@ -156,7 +157,7 @@ LayoutState::LayoutState(RenderObject* root) #endif { RenderObject* container = root->container(); - FloatPoint absContentPoint = container->localToAbsolute(FloatPoint(), UseTransforms | SnapOffsetForTransforms); + FloatPoint absContentPoint = container->localToAbsolute(FloatPoint(), UseTransforms); m_paintOffset = LayoutSize(absContentPoint.x(), absContentPoint.y()); if (container->hasOverflowClip()) { -- cgit v1.2.1