Changeset 184077 in webkit

Timestamp:

May 11, 2015, 4:06:25 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r182835 - Make inline continuation style change logic consistent.
​https://bugs.webkit.org/show_bug.cgi?id=143737
rdar://problem/20486596

Reviewed by Simon Fraser.

Do not force RenderBlock type-casting on the first sibling of the continuation's container.
The first sibling of the container of a continuation should be handled as the rest of the siblings.

Source/WebCore:

Test: fast/inline/inline-with-column-span-and-remove-block-child-crash.html

• rendering/RenderInline.cpp:

(WebCore::updateStyleOfAnonymousBlockContinuations):
(WebCore::RenderInline::styleDidChange):

LayoutTests:

• fast/inline/inline-with-column-span-and-remove-block-child-crash-expected.txt: Added.
• fast/inline/inline-with-column-span-and-remove-block-child-crash.html: Added.

Location:

releases/WebKitGTK/webkit-2.8

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline/inline-with-column-span-and-remove-block-child-crash-expected.txt (added)
• LayoutTests/fast/inline/inline-with-column-span-and-remove-block-child-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderInline.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog

@@ +1 @@
+2015-04-14  Zalan Bujtas  <zalan@apple.com>
+
+        Make inline continuation style change logic consistent.
+        https://bugs.webkit.org/show_bug.cgi?id=143737
+        rdar://problem/20486596
+
+        Reviewed by Simon Fraser.
+
+        Do not force RenderBlock type-casting on the first sibling of the continuation's container.
+        The first sibling of the container of a continuation should be handled as the rest of the siblings.
+
+        * fast/inline/inline-with-column-span-and-remove-block-child-crash-expected.txt: Added.
+        * fast/inline/inline-with-column-span-and-remove-block-child-crash.html: Added.
+
 2015-04-13  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

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

@@ +1 @@
+2015-04-14  Zalan Bujtas  <zalan@apple.com>
+
+        Make inline continuation style change logic consistent.
+        https://bugs.webkit.org/show_bug.cgi?id=143737
+        rdar://problem/20486596
+
+        Reviewed by Simon Fraser.
+
+        Do not force RenderBlock type-casting on the first sibling of the continuation's container.
+        The first sibling of the container of a continuation should be handled as the rest of the siblings.
+
+        Test: fast/inline/inline-with-column-span-and-remove-block-child-crash.html
+
+        * rendering/RenderInline.cpp:
+        (WebCore::updateStyleOfAnonymousBlockContinuations):
+        (WebCore::RenderInline::styleDidChange):
+
 2015-04-14  Brady Eidson  <beidson@apple.com>
 

releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderInline.cpp

@@ -139 +139 @@
 }
 
-static void updateStyleOfAnonymousBlockContinuations(RenderBlock& block, const RenderStyle* newStyle, const RenderStyle* oldStyle)
-{
-    for (RenderBox* box = █ box && box->isAnonymousBlock(); box = box->nextSiblingBox()) {
+static void updateStyleOfAnonymousBlockContinuations(const RenderBlock& block, const RenderStyle* newStyle, const RenderStyle* oldStyle)
+{
+    // If any descendant blocks exist then they will be in the next anonymous block and its siblings.
+    for (RenderBox* box = block.nextSiblingBox(); box && box->isAnonymousBlock(); box = box->nextSiblingBox()) {
         if (box->style().position() == newStyle->position())
             continue;
@@ -185 +186 @@
         // then any descendant blocks will need to change their in-flow positioning accordingly.
         // Do this by updating the position of the descendant blocks' containing anonymous blocks - there may be more than one.
-        if (containingBlock()->isAnonymousBlock() && oldStyle && newStyle.position() != oldStyle->position() && (newStyle.hasInFlowPosition() || oldStyle->hasInFlowPosition())) {
-            // If any descendant blocks exist then they will be in the next anonymous block and its siblings.
-            ASSERT(containingBlock()->nextSibling());
-            RenderBlock& block = downcast<RenderBlock>(*containingBlock()->nextSibling());
-            ASSERT(block.isAnonymousBlock());
-            updateStyleOfAnonymousBlockContinuations(block, &newStyle, oldStyle);
-        }
+        if (containingBlock()->isAnonymousBlock() && oldStyle && newStyle.position() != oldStyle->position() && (newStyle.hasInFlowPosition() || oldStyle->hasInFlowPosition()))
+            updateStyleOfAnonymousBlockContinuations(*containingBlock(), &newStyle, oldStyle);
     }