WebCore:
Reviewed by Sam Weinig.
- fix assertion failure in RenderBlock::determineStartPosition() at http://www.wired.com/techbiz/it/magazine/16-04/bz_apple
Test: fast/repaint/line-flow-with-floats-10.html
* rendering/bidi.cpp:
(WebCore::RenderBlock::determineStartPosition): Removed bogus assertion.
If the float's top margin has changed and it has not been repositioned
yet, we do not have its new y position.
LayoutTests:
Reviewed by Sam Weinig.
- test for assertion failure in RenderBlock::determineStartPosition() at http://www.wired.com/techbiz/it/magazine/16-04/bz_apple
* fast/repaint/line-flow-with-floats-10.html: Added.
* platform/mac/fast/repaint/line-flow-with-floats-10-expected.checksum: Added.
* platform/mac/fast/repaint/line-flow-with-floats-10-expected.png: Added.
* platform/mac/fast/repaint/line-flow-with-floats-10-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@31157 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp
index d42b597..3cfc1ef 100644
--- a/WebCore/rendering/bidi.cpp
+++ b/WebCore/rendering/bidi.cpp
@@ -1056,8 +1056,7 @@
break;
}
if (floats[floatIndex].rect.size() != newSize) {
- int floatTop = f->yPos() - f->marginTop();
- ASSERT(floatTop == floats[floatIndex].rect.y());
+ int floatTop = floats[floatIndex].rect.y();
curr->markDirty();
markLinesDirtyInVerticalRange(curr->blockHeight(), floatTop + max(floats[floatIndex].rect.height(), newSize.height()));
floats[floatIndex].rect.setSize(newSize);
