Changeset 31157 in webkit

Timestamp:

Mar 19, 2008 11:40:52 AM (16 years ago)

Author:

mitz@apple.com

Message:

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/repaint/line-flow-with-floats-10.html (added)
• LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-10-expected.checksum (added)
• LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-10-expected.png (added)
• LayoutTests/platform/mac/fast/repaint/line-flow-with-floats-10-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/bidi.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-03-19  Dan Bernstein  <mitz@apple.com>
+
+        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.
+
 2008-03-19  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-19  Dan Bernstein  <mitz@apple.com>
+
+        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.
+
 2008-03-19  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/rendering/bidi.cpp

@@ -1057 +1057 @@
                     }
                     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()));