Changeset 207980 in webkit

Timestamp:

Oct 27, 2016, 3:19:51 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r207631 - Stop searching for first-letter containers at multi-column boundary.
​https://bugs.webkit.org/show_bug.cgi?id=163739
<rdar://problem/28810750>

Source/WebCore:

We should not cross the multi-column boundary while searching for the first-letter container.
While moving first-letter renderers to a multi-column parent, it could result in finding the wrong
container and end up adding a new wrapper under the original container (from where we are moving the renderers).

Reviewed by David Hyatt.

Test: fast/css-generated-content/first-letter-move-to-multicolumn-crash.html

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::moveChildrenTo):

• rendering/RenderTextFragment.cpp:

(WebCore::RenderTextFragment::blockForAccompanyingFirstLetter):

LayoutTests:

Reviewed by David Hyatt.

• fast/css-generated-content/first-letter-move-to-multicolumn-crash-expected.txt: Added.
• fast/css-generated-content/first-letter-move-to-multicolumn-crash.html: Added.

Location:

releases/WebKitGTK/webkit-2.14

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-generated-content/first-letter-move-to-multicolumn-crash-expected.txt (added)
• LayoutTests/fast/css-generated-content/first-letter-move-to-multicolumn-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBoxModelObject.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderTextFragment.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-20  Zalan Bujtas  <zalan@apple.com>
+
+        Stop searching for first-letter containers at multi-column boundary.
+        https://bugs.webkit.org/show_bug.cgi?id=163739
+        <rdar://problem/28810750>
+
+        Reviewed by David Hyatt.
+
+        * fast/css-generated-content/first-letter-move-to-multicolumn-crash-expected.txt: Added.
+        * fast/css-generated-content/first-letter-move-to-multicolumn-crash.html: Added.
+
 2016-10-19  Zalan Bujtas  <zalan@apple.com>
 

releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-20  Zalan Bujtas  <zalan@apple.com>
+
+        Stop searching for first-letter containers at multi-column boundary.
+        https://bugs.webkit.org/show_bug.cgi?id=163739
+        <rdar://problem/28810750>
+
+        We should not cross the multi-column boundary while searching for the first-letter container.
+        While moving first-letter renderers to a multi-column parent, it could result in finding the wrong
+        container and end up adding a new wrapper under the original container (from where we are moving the renderers).    
+
+        Reviewed by David Hyatt.
+
+        Test: fast/css-generated-content/first-letter-move-to-multicolumn-crash.html
+
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::moveChildrenTo):
+        * rendering/RenderTextFragment.cpp:
+        (WebCore::RenderTextFragment::blockForAccompanyingFirstLetter):
+
 2016-10-20  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -2530 +2530 @@
         RenderObject* nextSibling = child->nextSibling();
         
+        // FIXME: This logic here fails to detect the first letter in certain cases
+        // and skips a valid sibling renderer (see webkit.org/b/163737).
         // Check to make sure we're not saving the firstLetter as the nextSibling.
         // When the |child| object will be moved, its firstLetter will be recreated,
-        // so saving it now in nextSibling would let us with a destroyed object.
+        // so saving it now in nextSibling would leave us with a stale object.
         if (is<RenderTextFragment>(*child) && is<RenderText>(nextSibling)) {
             RenderObject* firstLetterObj = nullptr;

releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderTextFragment.cpp

@@ -26 +26 @@
 #include "RenderBlock.h"
 #include "RenderIterator.h"
+#include "RenderMultiColumnFlowThread.h"
 #include "Text.h"
 
@@ -113 +114 @@
         return nullptr;
     for (auto& block : ancestorsOfType<RenderBlock>(*m_firstLetter)) {
+        if (is<RenderMultiColumnFlowThread>(block))
+            break;
         if (block.style().hasPseudoStyle(FIRST_LETTER) && block.canHaveChildren())
             return &block;