Changeset 94755 in webkit


Ignore:
Timestamp:
Sep 8, 2011 5:58:17 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r94695.
​http://trac.webkit.org/changeset/94695
​https://bugs.webkit.org/show_bug.cgi?id=67776

Hitting an assertion on Snow Leopard, Qt, GTK (Requested by
Zoltan on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-09-08

Source/WebCore:

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::positionedFloatsNeedRelayout):
(WebCore::RenderBlock::layoutPositionedObjects):

LayoutTests:

  • fast/block/positioning/absolute-layout-after-image-load-expected.txt: Removed.
  • fast/block/positioning/absolute-layout-after-image-load.html: Removed.
  • fast/block/positioning/positioned-float-layout-after-image-load-expected.txt: Removed.
  • fast/block/positioning/positioned-float-layout-after-image-load.html: Removed.
  • fast/block/positioning/resources/absolute-layout-after-image-load-2.html: Removed.
  • fast/block/positioning/resources/positioned-float-layout-after-image-load-2.html: Removed.
Location:
trunk
Files:
6 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r94753 r94755  
     12011-09-08  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r94695.
     4        http://trac.webkit.org/changeset/94695
     5        https://bugs.webkit.org/show_bug.cgi?id=67776
     6
     7        Hitting an assertion on Snow Leopard, Qt, GTK (Requested by
     8        Zoltan on #webkit).
     9
     10        * fast/block/positioning/absolute-layout-after-image-load-expected.txt: Removed.
     11        * fast/block/positioning/absolute-layout-after-image-load.html: Removed.
     12        * fast/block/positioning/positioned-float-layout-after-image-load-expected.txt: Removed.
     13        * fast/block/positioning/positioned-float-layout-after-image-load.html: Removed.
     14        * fast/block/positioning/resources/absolute-layout-after-image-load-2.html: Removed.
     15        * fast/block/positioning/resources/positioned-float-layout-after-image-load-2.html: Removed.
     16
    1172011-09-08  Csaba Osztrogonác  <ossy@webkit.org>
    218

  • trunk/Source/WebCore/ChangeLog

    r94754 r94755  
     12011-09-08  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r94695.
     4        http://trac.webkit.org/changeset/94695
     5        https://bugs.webkit.org/show_bug.cgi?id=67776
     6
     7        Hitting an assertion on Snow Leopard, Qt, GTK (Requested by
     8        Zoltan on #webkit).
     9
     10        * rendering/RenderBlock.cpp:
     11        (WebCore::RenderBlock::positionedFloatsNeedRelayout):
     12        (WebCore::RenderBlock::layoutPositionedObjects):
     13
    1142011-09-08  Alexander Pavlov  <apavlov@chromium.org>
    215

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

    r94740 r94755  
    22172217            return true;
    22182218
    2219         if (positionedObject->style()->hasStaticBlockPosition(isHorizontalWritingMode()) && positionedObject->parent() != this)
     2219        if (positionedObject->style()->hasStaticBlockPosition(isHorizontalWritingMode()) && positionedObject->parent() != this && positionedObject->parent()->isBlockFlow())
    22202220            return true;
    22212221       
    … …  
    22452245        // objects that are positioned implicitly like this.  Such objects are rare, and so in typical DHTML menu usage (where everything is
    22462246        // positioned explicitly) this should not incur a performance penalty.
    2247         if (relayoutChildren || (r->style()->hasStaticBlockPosition(isHorizontalWritingMode()) && r->parent() != this))
     2247        if (relayoutChildren || (r->style()->hasStaticBlockPosition(isHorizontalWritingMode()) && r->parent() != this && r->parent()->isBlockFlow()))
    22482248            r->setChildNeedsLayout(true, false);
    22492249           
Note: See TracChangeset for help on using the changeset viewer.