2011-06-14 Jeffrey Pfau <jpfau@apple.com>
authorAdemar de Souza Reis Jr <ademar.reis@openbossa.org>
Tue, 21 Jun 2011 16:55:41 +0000 (13:55 -0300)
committerAdemar de Souza Reis Jr <ademar.reis@openbossa.org>
Tue, 21 Jun 2011 16:55:41 +0000 (13:55 -0300)
commit03f14079d3bb08fda37239918cdf4180588a7fb0
tree532787bd8b0375f24a9e1ff59402a263837007d8
parent7a6f64da26097de9e6a6a26102dc8a40ed47550e
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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@88854 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Conflicts:

LayoutTests/platform/chromium/test_expectations.txt
LayoutTests/ChangeLog
LayoutTests/fast/multicol/span/span-as-nested-inline-block-child.html [new file with mode: 0644]
LayoutTests/platform/chromium/test_expectations.txt
LayoutTests/platform/mac/fast/multicol/span/span-as-nested-inline-block-child-expected.png [new file with mode: 0644]
LayoutTests/platform/mac/fast/multicol/span/span-as-nested-inline-block-child-expected.txt [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBlock.cpp