Title: [294426] trunk/Source/WebCore/rendering
- Revision
- 294426
- Author
- [email protected]
- Date
- 2022-05-18 12:48:37 -0700 (Wed, 18 May 2022)
Log Message
Unreviewed, fix build after 250680@main (again)
Patch by Michael Catanzaro <[email protected]> on 2022-05-18
https://bugs.webkit.org/show_bug.cgi?id=240416
* Source/WebCore/rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintMaskForTextFillBox):
* Source/WebCore/rendering/TextBoxPainter.cpp:
(WebCore::TextBoxPainter<TextBoxPath>::debugTextShadow const):
Canonical link: https://commits.webkit.org/250708@main
Modified Paths
Diff
Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (294425 => 294426)
--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2022-05-18 19:39:10 UTC (rev 294425)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2022-05-18 19:48:37 UTC (rev 294426)
@@ -732,8 +732,10 @@
textBoxPainter.paint();
continue;
}
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
ModernTextBoxPainter textBoxPainter(box->modernPath().inlineContent(), box->modernPath().box(), maskInfo, paintOffset);
textBoxPainter.paint();
+#endif
}
return;
}
Modified: trunk/Source/WebCore/rendering/TextBoxPainter.cpp (294425 => 294426)
--- trunk/Source/WebCore/rendering/TextBoxPainter.cpp 2022-05-18 19:39:10 UTC (rev 294425)
+++ trunk/Source/WebCore/rendering/TextBoxPainter.cpp 2022-05-18 19:48:37 UTC (rev 294426)
@@ -702,14 +702,18 @@
{
if (!m_renderer.settings().legacyLineLayoutVisualCoverageEnabled())
return nullptr;
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
if constexpr (std::is_same_v<TextBoxPath, InlineIterator::BoxModernPath>)
return nullptr;
+#endif
static NeverDestroyed<ShadowData> debugTextShadow(LengthPoint(Length(LengthType::Fixed), Length(LengthType::Fixed)), Length(10, LengthType::Fixed), Length(20, LengthType::Fixed), ShadowStyle::Normal, true, SRGBA<uint8_t> { 150, 0, 0, 190 });
return &debugTextShadow.get();
}
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
template class TextBoxPainter<InlineIterator::BoxModernPath>;
+#endif
template class TextBoxPainter<InlineIterator::BoxLegacyPath>;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes