diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-01-30 14:53:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-31 18:26:56 +0100 |
| commit | beb21ff26028d559d35ab748aa28d32d8ab0bdff (patch) | |
| tree | a13e230fe63c01824a13bb20c967362d9a5d8d8b | |
| parent | 1bedb01cc49cadc4f7d01ba8f2020cb73a453ec9 (diff) | |
| download | qtwebkit-beb21ff26028d559d35ab748aa28d32d8ab0bdff.tar.gz | |
Fix RenderGeometryMap.cpp ASSERT on Google Plus
The assert roundedIntPoint(result) == roundedIntPoint(rendererMappedResult)
is triggered on Google Plus. The cause appears to be premature rounding
leading a wrong result.
The fix is a to remove the early rounding. This follows a similar fix
in upstream WebKit r142638 where the same problem was fixed for the
other mapToContainer method.
Change-Id: Ifae91c204f2043b3f07682dc7bed711a6cb38c91
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | Source/WebCore/rendering/RenderGeometryMap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/RenderGeometryMap.cpp b/Source/WebCore/rendering/RenderGeometryMap.cpp index 4513ef6a1..949fc1cd7 100644 --- a/Source/WebCore/rendering/RenderGeometryMap.cpp +++ b/Source/WebCore/rendering/RenderGeometryMap.cpp @@ -105,7 +105,7 @@ FloatPoint RenderGeometryMap::mapToContainer(const FloatPoint& p, const RenderLa FloatPoint result; if (!hasFixedPositionStep() && !hasTransformStep() && !hasNonUniformStep() && (!container || (m_mapping.size() && container == m_mapping[0].m_renderer))) - result = p + roundedIntSize(m_accumulatedOffset); + result = p + m_accumulatedOffset; else { TransformState transformState(TransformState::ApplyTransformDirection, p); mapToContainer(transformState, container); |