Changeset 88854 in webkit


Ignore:
Timestamp:
Jun 14, 2011 2:51:29 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-06-14 Jeffrey Pfau <​jpfau@apple.com>

Reviewed by David Hyatt.

Null dereference in WebCore::RenderBlock::splitFlow regarding use of multicol, inline-block, and spanning elements
​https://bugs.webkit.org/show_bug.cgi?id=60028

Added test for spanning elements within an inline-block child of a multicol element.

  • fast/multicol/span/span-as-nested-inline-block-child.html: Added.
  • platform/chromium/test_expectations.txt:
  • platform/mac/fast/multicol/span/span-as-nested-inline-block-child-expected.png: Added.
  • platform/mac/fast/multicol/span/span-as-nested-inline-block-child-expected.txt: Added.

2011-06-14 Jeffrey Pfau <​jpfau@apple.com>

Reviewed by David Hyatt.

Null dereference in WebCore::RenderBlock::splitFlow regarding use of multicol, inline-block, and spanning elements
​https://bugs.webkit.org/show_bug.cgi?id=60028

Ensure that the parent block of a spanning element, if it is not itself
a multicol element, is not inline.

Test: fast/multicol/span/span-as-nested-inline-block-child.html

  • rendering/RenderBlock.cpp: (WebCore::RenderBlock::columnsBlockForSpanningElement):
Location:
trunk
Files:
3 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r88851 r88854  
     12011-06-14  Jeffrey Pfau  <jpfau@apple.com>
     2
     3        Reviewed by David Hyatt.
     4
     5        Null dereference in WebCore::RenderBlock::splitFlow regarding use of multicol, inline-block, and spanning elements
     6        https://bugs.webkit.org/show_bug.cgi?id=60028
     7
     8        Added test for spanning elements within an inline-block child of a multicol element.
     9
     10        * fast/multicol/span/span-as-nested-inline-block-child.html: Added.
     11        * platform/chromium/test_expectations.txt:
     12        * platform/mac/fast/multicol/span/span-as-nested-inline-block-child-expected.png: Added.
     13        * platform/mac/fast/multicol/span/span-as-nested-inline-block-child-expected.txt: Added.
     14
    1152011-06-14  Dimitri Glazkov  <dglazkov@chromium.org>
    216

  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r88851 r88854  
    38003800BUGWK61087 WIN MAC LINUX : fast/multicol/span/clone-anonymous-block-non-inline-child-crash.html = TEXT
    38013801
     3802// New test added for bug 60028, needs rebaselining
     3803BUGWK60028 : fast/multicol/span/span-as-nested-inline-block-child.html = FAIL
     3804
    38023805// Random crashes started between: http://trac.webkit.org/log/?verbose=on&rev=86756&stop_rev=86755
    38033806BUGWK61103 MAC : fast/canvas/canvas-putImageData.html = CRASH PASS

  • trunk/Source/WebCore/ChangeLog

    r88847 r88854  
     12011-06-14  Jeffrey Pfau  <jpfau@apple.com>
     2
     3        Reviewed by David Hyatt.
     4
     5        Null dereference in WebCore::RenderBlock::splitFlow regarding use of multicol, inline-block, and spanning elements
     6        https://bugs.webkit.org/show_bug.cgi?id=60028
     7
     8        Ensure that the parent block of a spanning element, if it is not itself
     9        a multicol element, is not inline.
     10
     11        Test: fast/multicol/span/span-as-nested-inline-block-child.html
     12
     13        * rendering/RenderBlock.cpp:
     14        (WebCore::RenderBlock::columnsBlockForSpanningElement):
     15
    1162011-06-14  Jer Noble  <jer.noble@apple.com>
    217

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

    r88526 r88854  
    631631        if (style()->specifiesColumns())
    632632            columnsBlockAncestor = this;
    633         else if (parent() && parent()->isRenderBlock())
     633        else if (!isInline() && parent() && parent()->isRenderBlock())
    634634            columnsBlockAncestor = toRenderBlock(parent())->containingColumnsBlock(false);
    635635    }
Note: See TracChangeset for help on using the changeset viewer.