ASSERTION FAILED: childrenInline() in WebCore::RenderBlockFlow::hasLines
authorzalan@apple.com <zalan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 24 Aug 2016 18:33:43 +0000 (18:33 +0000)
committerzalan@apple.com <zalan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 24 Aug 2016 18:33:43 +0000 (18:33 +0000)
commit1feda9f7acd6efa9868b1101dd7663dc06de4fd8
treea4a52dc3e53f10a3f2b27849f357a07ad1ec709d
parentf00f4bb594498b24c466b2f26e2c183907dbd6d7
ASSERTION FAILED: childrenInline() in WebCore::RenderBlockFlow::hasLines
https://bugs.webkit.org/show_bug.cgi?id=139396
<rdar://problem/27704339>

Reviewed by David Hyatt.

Source/WebCore:

RenderBlockFlow::hasLines() should be able to handle the block-children case.

Test: fast/ruby/assert-with-block-rt-child-and-emphasis.html

* rendering/RenderBlock.h:
(WebCore::RenderBlock::hasLines): Deleted.
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::hasLines):
* rendering/RenderBlockFlow.h:

LayoutTests:

* fast/ruby/assert-with-block-rt-child-and-emphasis-expected.txt: Added.
* fast/ruby/assert-with-block-rt-child-and-emphasis.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@204908 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/fast/ruby/assert-with-block-rt-child-and-emphasis-expected.txt [new file with mode: 0644]
LayoutTests/fast/ruby/assert-with-block-rt-child-and-emphasis.html [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBlock.h
Source/WebCore/rendering/RenderBlockFlow.cpp
Source/WebCore/rendering/RenderBlockFlow.h