Title: [294262] trunk/Source/WebCore
- Revision
- 294262
- Author
- commit-qu...@webkit.org
- Date
- 2022-05-16 14:41:43 -0700 (Mon, 16 May 2022)
Log Message
Unreviewed, fix build after 250565@main
https://bugs.webkit.org/show_bug.cgi?id=240416
Patch by Michael Catanzaro <mcatanz...@gnome.org> on 2022-05-16
* Source/WebCore/rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintMaskForTextFillBox):
* Source/WebCore/rendering/TextBoxPainter.cpp:
(WebCore::TextBoxPainter<TextBoxPath>::debugTextShadow const):
Canonical link: https://commits.webkit.org/250610@main
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (294261 => 294262)
--- trunk/Source/WebCore/ChangeLog 2022-05-16 21:37:00 UTC (rev 294261)
+++ trunk/Source/WebCore/ChangeLog 2022-05-16 21:41:43 UTC (rev 294262)
@@ -1,3 +1,14 @@
+2022-05-16 Michael Catanzaro <mcatanz...@redhat.com>
+
+ Unreviewed, fix build after 250565@main
+ https://bugs.webkit.org/show_bug.cgi?id=240416
+ <rdar://problem/93293276>
+
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintMaskForTextFillBox):
+ * rendering/TextBoxPainter.cpp:
+ (WebCore::TextBoxPainter<TextBoxPath>::debugTextShadow const):
+
2022-05-16 Ziran Sun <z...@igalia.com>
[css-ui] alias appearance <compat-auto> keywords to 'auto' for textfield
Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (294261 => 294262)
--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2022-05-16 21:37:00 UTC (rev 294261)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2022-05-16 21:41:43 UTC (rev 294262)
@@ -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 (294261 => 294262)
--- trunk/Source/WebCore/rendering/TextBoxPainter.cpp 2022-05-16 21:37:00 UTC (rev 294261)
+++ trunk/Source/WebCore/rendering/TextBoxPainter.cpp 2022-05-16 21:41:43 UTC (rev 294262)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
