Skip to content
Permalink
Browse files
ASSERTION FAILED: rangesIntersect(m_renderer.pixelSnappedLogicalTopFo…
…rFloat(floatingObject), m_renderer.pixelSnappedLogicalBottomForFloat(floatingObject), m_lineTop, m_lineBottom) ../../Source/WebCore/rendering/FloatingObjects.cpp(463)

https://bugs.webkit.org/show_bug.cgi?id=124375

Reviewed by Alexandru Chiculita.

When moving the placed floats tree over to LayoutUnit, I forgot to
update these asserts, which causes issues on ports with subpixel
layout enabled.

No new tests, no behavior change.

* rendering/FloatingObjects.cpp:
(WebCore::FindNextFloatLogicalBottomAdapter::collectIfNeeded):
(WebCore::::collectIfNeeded):


Canonical link: https://commits.webkit.org/142592@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@159324 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
bemjb committed Nov 15, 2013
1 parent 292e3bf commit 13e132a05b936dba90307509ede3712122cec6fc
Showing with 19 additions and 2 deletions.
  1. +17 −0 Source/WebCore/ChangeLog
  2. +2 −2 Source/WebCore/rendering/FloatingObjects.cpp
@@ -1,3 +1,20 @@
2013-11-14 Bem Jones-Bey <bjonesbe@adobe.com>

ASSERTION FAILED: rangesIntersect(m_renderer.pixelSnappedLogicalTopForFloat(floatingObject), m_renderer.pixelSnappedLogicalBottomForFloat(floatingObject), m_lineTop, m_lineBottom) ../../Source/WebCore/rendering/FloatingObjects.cpp(463)
https://bugs.webkit.org/show_bug.cgi?id=124375

Reviewed by Alexandru Chiculita.

When moving the placed floats tree over to LayoutUnit, I forgot to
update these asserts, which causes issues on ports with subpixel
layout enabled.

No new tests, no behavior change.

* rendering/FloatingObjects.cpp:
(WebCore::FindNextFloatLogicalBottomAdapter::collectIfNeeded):
(WebCore::::collectIfNeeded):

2013-11-14 Victor Costan <costan@gmail.com>

Clean up sequence handling in Blob constructor
@@ -187,7 +187,7 @@ inline void FindNextFloatLogicalBottomAdapter::collectIfNeeded(const IntervalTyp

// All the objects returned from the tree should be already placed.
ASSERT(floatingObject->isPlaced());
ASSERT(rangesIntersect(m_renderer.pixelSnappedLogicalTopForFloat(floatingObject), m_renderer.pixelSnappedLogicalBottomForFloat(floatingObject), m_belowLogicalHeight, m_aboveLogicalHeight));
ASSERT(rangesIntersect(m_renderer.logicalTopForFloat(floatingObject), m_renderer.logicalBottomForFloat(floatingObject), m_belowLogicalHeight, m_aboveLogicalHeight));

LayoutUnit floatBottom = m_renderer.logicalBottomForFloat(floatingObject);
if (m_nextLogicalBottom < floatBottom)
@@ -460,7 +460,7 @@ inline void ComputeFloatOffsetAdapter<FloatTypeValue>::collectIfNeeded(const Int

// All the objects returned from the tree should be already placed.
ASSERT(floatingObject->isPlaced());
ASSERT(rangesIntersect(m_renderer.pixelSnappedLogicalTopForFloat(floatingObject), m_renderer.pixelSnappedLogicalBottomForFloat(floatingObject), m_lineTop, m_lineBottom));
ASSERT(rangesIntersect(m_renderer.logicalTopForFloat(floatingObject), m_renderer.logicalBottomForFloat(floatingObject), m_lineTop, m_lineBottom));

bool floatIsNewExtreme = updateOffsetIfNeeded(floatingObject);
if (floatIsNewExtreme)

0 comments on commit 13e132a

Please sign in to comment.