Title: [243573] branches/safari-607-branch
- Revision
- 243573
- Author
- [email protected]
- Date
- 2019-03-27 16:43:41 -0700 (Wed, 27 Mar 2019)
Log Message
Cherry-pick r242919. rdar://problem/49307949
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.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242919 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Added Paths
Diff
Modified: branches/safari-607-branch/LayoutTests/ChangeLog (243572 => 243573)
--- branches/safari-607-branch/LayoutTests/ChangeLog 2019-03-27 23:43:37 UTC (rev 243572)
+++ branches/safari-607-branch/LayoutTests/ChangeLog 2019-03-27 23:43:41 UTC (rev 243573)
@@ -1,5 +1,43 @@
2019-03-27 Alan Coon <[email protected]>
+ Cherry-pick r242919. rdar://problem/49307949
+
+ 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.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242919 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-03-13 Zalan Bujtas <[email protected]>
+
+ 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-27 Alan Coon <[email protected]>
+
Cherry-pick r242917. rdar://problem/49307956
Fix an edge case where HTMLFormElement::removeFormElement is invoked twice with the same element
Added: branches/safari-607-branch/LayoutTests/fast/ruby/crash-when-paginated-ruby-expected.txt (0 => 243573)
--- branches/safari-607-branch/LayoutTests/fast/ruby/crash-when-paginated-ruby-expected.txt (rev 0)
+++ branches/safari-607-branch/LayoutTests/fast/ruby/crash-when-paginated-ruby-expected.txt 2019-03-27 23:43:41 UTC (rev 243573)
@@ -0,0 +1 @@
+click me Pass if no crash.
Added: branches/safari-607-branch/LayoutTests/fast/ruby/crash-when-paginated-ruby.html (0 => 243573)
--- branches/safari-607-branch/LayoutTests/fast/ruby/crash-when-paginated-ruby.html (rev 0)
+++ branches/safari-607-branch/LayoutTests/fast/ruby/crash-when-paginated-ruby.html 2019-03-27 23:43:41 UTC (rev 243573)
@@ -0,0 +1,16 @@
+<style>
+ruby {
+ float:left;
+ column-count: 2;
+}
+</style>
+<ruby id=ruby>content</ruby>
+Pass if no crash.
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+document.body.offsetHeight;
+ruby.innerHTML="<button>click me</button>";
+styleSheet = document.styleSheets[0];
+styleSheet.addRule('#ruby::before','content: counter(coun2)');
+</script>
Modified: branches/safari-607-branch/LayoutTests/platform/mac/TestExpectations (243572 => 243573)
--- branches/safari-607-branch/LayoutTests/platform/mac/TestExpectations 2019-03-27 23:43:37 UTC (rev 243572)
+++ branches/safari-607-branch/LayoutTests/platform/mac/TestExpectations 2019-03-27 23:43:41 UTC (rev 243573)
@@ -150,6 +150,7 @@
# 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 ]
Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (243572 => 243573)
--- branches/safari-607-branch/Source/WebCore/ChangeLog 2019-03-27 23:43:37 UTC (rev 243572)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog 2019-03-27 23:43:41 UTC (rev 243573)
@@ -1,5 +1,48 @@
2019-03-27 Alan Coon <[email protected]>
+ Cherry-pick r242919. rdar://problem/49307949
+
+ 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.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242919 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-03-13 Zalan Bujtas <[email protected]>
+
+ 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-27 Alan Coon <[email protected]>
+
Cherry-pick r242917. rdar://problem/49307956
Fix an edge case where HTMLFormElement::removeFormElement is invoked twice with the same element
Modified: branches/safari-607-branch/Source/WebCore/rendering/RenderMultiColumnFlow.cpp (243572 => 243573)
--- branches/safari-607-branch/Source/WebCore/rendering/RenderMultiColumnFlow.cpp 2019-03-27 23:43:37 UTC (rev 243572)
+++ branches/safari-607-branch/Source/WebCore/rendering/RenderMultiColumnFlow.cpp 2019-03-27 23:43:41 UTC (rev 243573)
@@ -93,11 +93,7 @@
RenderBox* RenderMultiColumnFlow::nextColumnSetOrSpannerSiblingOf(const RenderBox* child)
{
- if (!child)
- return nullptr;
- if (RenderObject* sibling = child->nextSibling())
- return downcast<RenderBox>(sibling);
- return nullptr;
+ return child ? child->nextSiblingBox() : nullptr;
}
RenderBox* RenderMultiColumnFlow::previousColumnSetOrSpannerSiblingOf(const RenderBox* child)
@@ -104,10 +100,9 @@
{
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;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
