Changeset 204908 in webkit

Timestamp:

Aug 24, 2016 11:33:43 AM (8 years ago)

Author:

Alan Bujtas

Message:

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/ruby/assert-with-block-rt-child-and-emphasis-expected.txt (added)
• LayoutTests/fast/ruby/assert-with-block-rt-child-and-emphasis.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.h (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockFlow.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockFlow.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-08-24  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: childrenInline() in WebCore::RenderBlockFlow::hasLines
+        https://bugs.webkit.org/show_bug.cgi?id=139396
+        <rdar://problem/27704339>
+
+        Reviewed by David Hyatt.
+
+        * fast/ruby/assert-with-block-rt-child-and-emphasis-expected.txt: Added.
+        * fast/ruby/assert-with-block-rt-child-and-emphasis.html: Added.
+
 2016-08-24  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-24  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: childrenInline() in WebCore::RenderBlockFlow::hasLines
+        https://bugs.webkit.org/show_bug.cgi?id=139396
+        <rdar://problem/27704339>
+
+        Reviewed by David Hyatt.
+
+        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:
+
 2016-08-24  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -418 +418 @@
     virtual bool childrenPreventSelfCollapsing() const;
     
-    // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to RenderBlockFlow
-    virtual bool hasLines() const { return false; }
-
     void createFirstLetterRenderer(RenderElement* firstLetterBlock, RenderText* currentTextChild);
     void updateFirstLetterStyle(RenderElement* firstLetterBlock, RenderObject* firstLetterContainer);

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -3598 +3598 @@
 bool RenderBlockFlow::hasLines() const
 {
-    ASSERT(childrenInline());
+    if (!childrenInline())
+        return false;
 
     if (auto simpleLineLayout = this->simpleLineLayout())

trunk/Source/WebCore/rendering/RenderBlockFlow.h

@@ -346 +346 @@
     RootInlineBox* lastRootBox() const { return downcast<RootInlineBox>(m_lineBoxes.lastLineBox()); }
 
-    bool hasLines() const final;
+    bool hasLines() const;
     void invalidateLineLayoutPath() final;