Changeset 242919 in webkit

Timestamp:

Mar 13, 2019, 4:36:02 PM (7 years ago)

Author:

Alan Bujtas

Message:

Use RenderBox::previousSiblingBox/nextSiblingBox in RenderMultiColumnFlow
​https://bugs.webkit.org/show_bug.cgi?id=195701
<rdar://problem/48448658>

Reviewed by Simon Fraser.

Source/WebCore:

It's safer to use existing RenderBox functions to get sibling boxes.

Test: fast/ruby/crash-when-paginated-ruby.html

• rendering/RenderMultiColumnFlow.cpp:

(WebCore::RenderMultiColumnFlow::nextColumnSetOrSpannerSiblingOf):
(WebCore::RenderMultiColumnFlow::previousColumnSetOrSpannerSiblingOf):

LayoutTests:

• fast/ruby/crash-when-paginated-ruby-expected.txt: Added.
• fast/ruby/crash-when-paginated-ruby.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/ruby/crash-when-paginated-ruby-expected.txt (added)
• LayoutTests/fast/ruby/crash-when-paginated-ruby.html (added)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderMultiColumnFlow.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-03-13  Zalan Bujtas  <zalan@apple.com>
+
+        Use RenderBox::previousSiblingBox/nextSiblingBox in RenderMultiColumnFlow
+        https://bugs.webkit.org/show_bug.cgi?id=195701
+        <rdar://problem/48448658>
+
+        Reviewed by Simon Fraser.
+
+        * fast/ruby/crash-when-paginated-ruby-expected.txt: Added.
+        * fast/ruby/crash-when-paginated-ruby.html: Added.
+
 2019-03-13  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -153 +153 @@
 # Asserts in debug.
 [ Debug ] fast/images/large-size-image-crash.html [ Skip ]
+[ Debug ] fast/ruby/crash-when-paginated-ruby.html [ Skip ]
 
 webkit.org/b/188061 [ Debug ] webgl/2.0.0/conformance2/glsl3/compound-assignment-type-combination.html [ Slow ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-13  Zalan Bujtas  <zalan@apple.com>
+
+        Use RenderBox::previousSiblingBox/nextSiblingBox in RenderMultiColumnFlow
+        https://bugs.webkit.org/show_bug.cgi?id=195701
+        <rdar://problem/48448658>
+
+        Reviewed by Simon Fraser.
+
+        It's safer to use existing RenderBox functions to get sibling boxes.
+
+        Test: fast/ruby/crash-when-paginated-ruby.html
+
+        * rendering/RenderMultiColumnFlow.cpp:
+        (WebCore::RenderMultiColumnFlow::nextColumnSetOrSpannerSiblingOf):
+        (WebCore::RenderMultiColumnFlow::previousColumnSetOrSpannerSiblingOf):
+
 2019-03-13  Keith Rollin  <krollin@apple.com>
 

trunk/Source/WebCore/rendering/RenderMultiColumnFlow.cpp

@@ -94 +94 @@
 RenderBox* RenderMultiColumnFlow::nextColumnSetOrSpannerSiblingOf(const RenderBox* child)
 {
+    return child ? child->nextSiblingBox() : nullptr;
+}
+
+RenderBox* RenderMultiColumnFlow::previousColumnSetOrSpannerSiblingOf(const RenderBox* child)
+{
     if (!child)
         return nullptr;
-    if (RenderObject* sibling = child->nextSibling())
-        return downcast<RenderBox>(sibling);
-    return nullptr;
-}
-
-RenderBox* RenderMultiColumnFlow::previousColumnSetOrSpannerSiblingOf(const RenderBox* child)
-{
-    if (!child)
-        return nullptr;
-    if (RenderObject* sibling = child->previousSibling()) {
-        if (is<RenderFragmentedFlow>(*sibling))
-            return nullptr;
-        return downcast<RenderBox>(sibling);
+    if (auto* sibling = child->previousSiblingBox()) {
+        if (!is<RenderFragmentedFlow>(*sibling))
+            return sibling;
     }
     return nullptr;