Skip to content

Commit

Permalink
Unreviewed, fix build after 250680@main (again)
Browse files Browse the repository at this point in the history
Patch by Michael Catanzaro <mcatanzaro@redhat.com> 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
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294426 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
mcatanzaro authored and webkit-commit-queue committed May 18, 2022
1 parent 4034a75 commit 37cf762
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Source/WebCore/rendering/RenderBoxModelObject.cpp
Expand Up @@ -732,8 +732,10 @@ void RenderBoxModelObject::paintMaskForTextFillBox(ImageBuffer* maskImage, const
textBoxPainter.paint();
continue;
}
#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
ModernTextBoxPainter textBoxPainter(box->modernPath().inlineContent(), box->modernPath().box(), maskInfo, paintOffset);
textBoxPainter.paint();
#endif
}
return;
}
Expand Down
4 changes: 4 additions & 0 deletions Source/WebCore/rendering/TextBoxPainter.cpp
Expand Up @@ -702,14 +702,18 @@ const ShadowData* TextBoxPainter<TextBoxPath>::debugTextShadow() const
{
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>;

}

0 comments on commit 37cf762

Please sign in to comment.