Title: [288841] branches/safari-613.1.16.1-branch/Source/WebCore
- Revision
- 288841
- Author
- [email protected]
- Date
- 2022-01-31 14:01:42 -0800 (Mon, 31 Jan 2022)
Log Message
Cherry-pick r288829. rdar://problem/87402815
LineLayout::collectOverflow() should null check m_inlineContent
https://bugs.webkit.org/show_bug.cgi?id=235902
rdar://87402815
Reviewed by Alan Bujtas.
Speculative fix but it can be null.
* layout/integration/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::collectOverflow):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288829 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613.1.16.1-branch/Source/WebCore/ChangeLog (288840 => 288841)
--- branches/safari-613.1.16.1-branch/Source/WebCore/ChangeLog 2022-01-31 21:37:14 UTC (rev 288840)
+++ branches/safari-613.1.16.1-branch/Source/WebCore/ChangeLog 2022-01-31 22:01:42 UTC (rev 288841)
@@ -1,5 +1,36 @@
2022-01-31 Russell Epstein <[email protected]>
+ Cherry-pick r288829. rdar://problem/87402815
+
+ LineLayout::collectOverflow() should null check m_inlineContent
+ https://bugs.webkit.org/show_bug.cgi?id=235902
+ rdar://87402815
+
+ Reviewed by Alan Bujtas.
+
+ Speculative fix but it can be null.
+
+ * layout/integration/LayoutIntegrationLineLayout.cpp:
+ (WebCore::LayoutIntegration::LineLayout::collectOverflow):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288829 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-01-31 Antti Koivisto <[email protected]>
+
+ LineLayout::collectOverflow() should null check m_inlineContent
+ https://bugs.webkit.org/show_bug.cgi?id=235902
+ rdar://87402815
+
+ Reviewed by Alan Bujtas.
+
+ Speculative fix but it can be null.
+
+ * layout/integration/LayoutIntegrationLineLayout.cpp:
+ (WebCore::LayoutIntegration::LineLayout::collectOverflow):
+
+2022-01-31 Russell Epstein <[email protected]>
+
Cherry-pick r288095. rdar://problem/88286876
[LFC][IFC] ASSERT in InlineContentBreaker::tryBreakingPreviousNonOverflowingRuns (!partialRun->length) when webinspector is open
Modified: branches/safari-613.1.16.1-branch/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp (288840 => 288841)
--- branches/safari-613.1.16.1-branch/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp 2022-01-31 21:37:14 UTC (rev 288840)
+++ branches/safari-613.1.16.1-branch/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp 2022-01-31 22:01:42 UTC (rev 288841)
@@ -416,7 +416,10 @@
void LineLayout::collectOverflow()
{
- for (auto& line : inlineContent()->lines) {
+ if (!m_inlineContent)
+ return;
+
+ for (auto& line : m_inlineContent->lines) {
flow().addLayoutOverflow(Layout::toLayoutRect(line.scrollableOverflow()));
if (!flow().hasNonVisibleOverflow())
flow().addVisualOverflow(Layout::toLayoutRect(line.inkOverflow()));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
