Changeset 140225 in webkit


Ignore:
Timestamp:
Jan 18, 2013 5:42:16 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r140206.
​http://trac.webkit.org/changeset/140206
​https://bugs.webkit.org/show_bug.cgi?id=107346

Caused crash on wordpress.com (Requested by smfr on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2013-01-18

Source/WebCore:

  • rendering/RenderBox.cpp:

(WebCore::RenderBox::removeFloatingOrPositionedChildFromBlockLists):

LayoutTests:

  • fast/block/float/overhanging-float-not-removed-crash-expected.txt: Removed.
  • fast/block/float/overhanging-float-not-removed-crash.html: Removed.
Location:
trunk
Files:
2 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r140223 r140225  
     12013-01-18  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r140206.
     4        http://trac.webkit.org/changeset/140206
     5        https://bugs.webkit.org/show_bug.cgi?id=107346
     6
     7        Caused crash on wordpress.com (Requested by smfr on #webkit).
     8
     9        * fast/block/float/overhanging-float-not-removed-crash-expected.txt: Removed.
     10        * fast/block/float/overhanging-float-not-removed-crash.html: Removed.
     11
    1122013-01-18  Simon Fraser  <simon.fraser@apple.com>
    213

  • trunk/Source/WebCore/ChangeLog

    r140223 r140225  
     12013-01-18  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r140206.
     4        http://trac.webkit.org/changeset/140206
     5        https://bugs.webkit.org/show_bug.cgi?id=107346
     6
     7        Caused crash on wordpress.com (Requested by smfr on #webkit).
     8
     9        * rendering/RenderBox.cpp:
     10        (WebCore::RenderBox::removeFloatingOrPositionedChildFromBlockLists):
     11
    1122013-01-18  Simon Fraser  <simon.fraser@apple.com>
    213

  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r140206 r140225  
    180180
    181181        if (parentBlock) {
    182             // Need to skip anonymous blocks in our ancestor chain since our overhanging floats
    183             // can be in the next siblings of enclosing block.
    184             while (parentBlock && parentBlock->isAnonymousBlock())
    185                 parentBlock = parentBlock->containingBlock();
    186             ASSERT(parentBlock);
    187 
    188182            RenderObject* parent = parentBlock->parent();
    189183            if (parent && parent->isFlexibleBoxIncludingDeprecated())
Note: See TracChangeset for help on using the changeset viewer.