Skip to content

Reduce complex text #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 15, 2025
Merged

Reduce complex text #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab25e90
Disable complex text rendering in more cases
lonemadmax Mar 2, 2025
9c1b3d2
Call debugger on complex text path
lonemadmax Mar 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Source/WebCore/platform/graphics/ComplexTextController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@
#include <CoreText/CoreText.h>
#endif

static void debugComplexText()
{
if (strcmp(getenv("HAIKUWEBKIT_COMPLEX_TEXT"), "DEBUGGER") == 0)
debugger("Complex text path triggered");
}

namespace WebCore {

WTF_MAKE_TZONE_ALLOCATED_IMPL(ComplexTextController);
Expand Down Expand Up @@ -125,6 +131,8 @@ ComplexTextController::ComplexTextController(const FontCascade& font, const Text
, m_forTextEmphasis(forTextEmphasis)
, m_textSpacingState(run.textSpacingState())
{
debugComplexText();

computeExpansionOpportunity();

collectComplexTextRuns();
Expand All @@ -138,6 +146,8 @@ ComplexTextController::ComplexTextController(const FontCascade& font, const Text
, m_end(run.length())
, m_expansion(run.expansion())
{
debugComplexText();

computeExpansionOpportunity();

for (auto& run : runs)
Expand All @@ -151,6 +161,7 @@ ComplexTextController::ComplexTextController(const TextRun& run, const FontCasca
, m_run(run)
, m_end(run.length())
{
debugComplexText();
}

std::pair<float, float> ComplexTextController::enclosingGlyphBoundsForTextRun(const FontCascade& fontCascade, const TextRun& textRun)
Expand Down
3 changes: 3 additions & 0 deletions Source/WebCore/platform/graphics/FontCascade.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,9 @@ FontCascade::CodePath FontCascade::codePath(const TextRun& run, std::optional<un

FontCascade::CodePath FontCascade::characterRangeCodePath(std::span<const UChar> span)
{
#if PLATFORM(HAIKU)
return CodePath::Simple;
#endif
// FIXME: Should use a UnicodeSet in ports where ICU is used. Note that we
// can't simply use UnicodeCharacter Property/class because some characters
// are not 'combining', but still need to go to the complex path.
Expand Down
5 changes: 5 additions & 0 deletions Source/WebCore/platform/graphics/FontCascade.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,13 @@ class FontCascade final : public CanMakeWeakPtr<FontCascade>, public CanMakeChec
bool isFixedPitch() const;
bool canTakeFixedPitchFastContentMeasuring() const;

#if PLATFORM(HAIKU)
bool enableKerning() const { return false; }
bool requiresShaping() const { return false; }
#else
bool enableKerning() const { return m_enableKerning; }
bool requiresShaping() const { return m_requiresShaping; }
#endif

const AtomString& firstFamily() const { return m_fontDescription.firstFamily(); }
unsigned familyCount() const { return m_fontDescription.familyCount(); }
Expand Down