Changeset 31132 in webkit


Ignore:
Timestamp:
Mar 18, 2008, 11:15:16 AM (17 years ago)
Author:
mitz@apple.com
Message:

WebCore:

2008-03-18 Dan Bernstein <​mitz@apple.com>

Reviewed by Adele Peterson.

  • fix <rdar://problem/5805127> REGRESSION (r31116): Assertion failure (floatIndex < floats.size()) in RenderBlock::determineStartPosition() at digg.com

Test: fast/dynamic/floating-to-positioned.html

  • rendering/RenderObject.cpp: (WebCore::RenderObject::setStyle): Added code to remove a float from object lists if its position property changes to something other than static, since then it ceases to be a float.

LayoutTests:

2008-03-18 Dan Bernstein <​mitz@apple.com>

Reviewed by Adele Peterson.

  • test for <rdar://problem/5805127> REGRESSION (r31116): Assertion failure (floatIndex < floats.size()) in RenderBlock::determineStartPosition() at digg.com
  • fast/dynamic/floating-to-positioned.html: Added.
  • platform/mac/fast/dynamic/floating-to-positioned-expected.checksum: Added.
  • platform/mac/fast/dynamic/floating-to-positioned-expected.png: Added.
  • platform/mac/fast/dynamic/floating-to-positioned-expected.txt: Added.
Location:
trunk
Files:
4 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r31116 r31132  
     12008-03-18  Dan Bernstein  <mitz@apple.com>
     2
     3        Reviewed by Adele Peterson.
     4
     5        - test for <rdar://problem/5805127> REGRESSION (r31116): Assertion failure (floatIndex < floats.size()) in RenderBlock::determineStartPosition() at digg.com
     6
     7        * fast/dynamic/floating-to-positioned.html: Added.
     8        * platform/mac/fast/dynamic/floating-to-positioned-expected.checksum: Added.
     9        * platform/mac/fast/dynamic/floating-to-positioned-expected.png: Added.
     10        * platform/mac/fast/dynamic/floating-to-positioned-expected.txt: Added.
     11
    1122008-03-17  Dan Bernstein  <mitz@apple.com>
    213

  • trunk/WebCore/ChangeLog

    r31131 r31132  
     12008-03-18  Dan Bernstein  <mitz@apple.com>
     2
     3        Reviewed by Adele Peterson.
     4
     5        - fix <rdar://problem/5805127> REGRESSION (r31116): Assertion failure (floatIndex < floats.size()) in RenderBlock::determineStartPosition() at digg.com
     6
     7        Test: fast/dynamic/floating-to-positioned.html
     8
     9        * rendering/RenderObject.cpp:
     10        (WebCore::RenderObject::setStyle): Added code to remove a float from
     11        object lists if its position property changes to something other than
     12        static, since then it ceases to be a float.
     13
    1142008-03-18  Adam Roben  <aroben@apple.com>
    215

  • trunk/WebCore/rendering/RenderObject.cpp

    r30992 r31132  
    21622162        if (d == RenderStyle::Layout && m_parent && m_style->position() != style->position()) {
    21632163            markContainingBlocksForLayout();
    2164             if (m_style->position() == StaticPosition)
     2164            if (m_style->position() == StaticPosition) {
    21652165                repaint();
    2166             if (isRenderBlock()) {
     2166                if (isFloating())
     2167                    removeFromObjectLists();
     2168            } if (isRenderBlock()) {
    21672169                if (style->position() == StaticPosition)
    21682170                    // Clear our positioned objects list. Our absolutely positioned descendants will be
Note: See TracChangeset for help on using the changeset viewer.