Changeset 95654 in webkit


Ignore:
Timestamp:
Sep 21, 2011 11:45:56 AM (13 years ago)
Author:
mitz@apple.com
Message:

<rdar://problem/9768483> REGRESSION: Crash in RenderBlock::removeFloatingObjectsBelow()
https://bugs.webkit.org/show_bug.cgi?id=68550

Reviewed by Darin Adler.

Source/WebCore:

Test: fast/multicol/null-lastFloat-in-removeFloatingObjectsBelow.html

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::removeFloatingObjectsBelow): Break out of the while() loop when the
floating object set is empty, which can happen if there were no floats on previous lines
(in which case, lastFloat is 0).

LayoutTests:

  • fast/multicol/null-lastFloat-in-removeFloatingObjectsBelow-expected.txt: Added.
  • fast/multicol/null-lastFloat-in-removeFloatingObjectsBelow.html: Added.
Location:
trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r95653 r95654  
     12011-09-21  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/9768483> REGRESSION: Crash in RenderBlock::removeFloatingObjectsBelow()
     4        https://bugs.webkit.org/show_bug.cgi?id=68550
     5
     6        Reviewed by Darin Adler.
     7
     8        * fast/multicol/null-lastFloat-in-removeFloatingObjectsBelow-expected.txt: Added.
     9        * fast/multicol/null-lastFloat-in-removeFloatingObjectsBelow.html: Added.
     10
    1112011-09-21  Dmitry Lomov  <dslomov@google.com>
    212
  • trunk/Source/WebCore/ChangeLog

    r95651 r95654  
     12011-09-21  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/9768483> REGRESSION: Crash in RenderBlock::removeFloatingObjectsBelow()
     4        https://bugs.webkit.org/show_bug.cgi?id=68550
     5
     6        Reviewed by Darin Adler.
     7
     8        Test: fast/multicol/null-lastFloat-in-removeFloatingObjectsBelow.html
     9
     10        * rendering/RenderBlock.cpp:
     11        (WebCore::RenderBlock::removeFloatingObjectsBelow): Break out of the while() loop when the
     12        floating object set is empty, which can happen if there were no floats on previous lines
     13        (in which case, lastFloat is 0).
     14
    1152011-09-21  ChangSeok Oh  <shivamidow@gmail.com>
    216
  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r95577 r95654  
    32913291        ASSERT(!curr->m_originatingLine);
    32923292        delete curr;
     3293        if (floatingObjectSet.isEmpty())
     3294            break;
    32933295        curr = floatingObjectSet.last();
    32943296    }
Note: See TracChangeset for help on using the changeset viewer.