Avalonia

Commit Graph

Author	SHA1	Message	Date
Benedikt Stebner	4459a577fd	[Text] Snap a right-to-left buffer split to the cluster boundary (#22066 ) * Add failing test for a right-to-left split inside a cluster Splitting a right-to-left shaped buffer keeps a straddling cluster's glyphs together in the leading half, but cuts the text at the requested offset instead of following them. The halves then disagree about which characters their glyphs cover: the leading half claims one character while holding the glyphs for two, and the trailing half claims a character whose glyphs it doesn't have. The left-to-right path already snaps the text boundary to the cluster. * Snap a right-to-left split to the cluster the glyphs stay with A cluster straddling the split point keeps all its glyphs in the leading half, so the text has to be cut where those glyphs end, not at the requested offset. Cutting at the offset produced two halves whose glyph and character coverage disagreed, and their shared cluster cache then described neither: measuring the trailing half returned counts that cut a cluster, and splitting it again could hand back a leading half holding every glyph and no trailing half at all - a null run that crashed the bidi reorderer. The ascending path already snapped this way; this makes the descending path match.	1 month ago
Benedikt Stebner	aee3f68551	TextCollapsingProperties bidirectional-text (BiDi) correctness fixes (#21446 ) * Fix BiDi correctness across TextCollapsingProperties implementations Audit and fix logical-vs-visual ordering bugs in every text-collapsing implementation and the helpers they share, so trimming always operates in logical order (the consumer re-runs the BiDi reorderer in FinalizeLine, so pre-applying visual order would be reordered a second time). - LogicalTextRunEnumerator returned the first run on every MoveNext when _indexedTextRuns was null. - TextLeadingPrefixCharacterEllipsis: walked visual-order runs while splitting at logical offsets, guarded the wrong field in the ctor, hardcoded LeftToRight for the symbol, appended the suffix in reverse-logical order, and mis-tracked the width budget across multi-run lines. - TextPathSegmentEllipsis: crashed via Split(0) in the fallback path, and measured RTL segments as ~0 width (it assumed ascending cluster ids). - ShapedTextRun.TryMeasureCharacters/Backwards returned visual-order counts for RTL runs. ShapedBuffer gains logical-order, cluster-cache-backed width helpers (GetCharRangeWidth, FindLeading/FindTrailingCharCountWithinWidth) that are safe in the one-char-per-cluster simple mode (null _clusterStartChars). Adds a BiDi characterization test suite and documents the logical-order Collapse contract. * Align text width comparisons to epsilon-tolerant MathUtilities Several width-fit comparisons in the measure/collapse path used raw operators with no epsilon, while the cluster-cache hot path (MeasureCharactersThatFit) and the ShapedTextRun branch of MeasureLength already went through MathUtilities. Replace the raw float comparisons with their epsilon-aware equivalents (<= -> LessThanOrClose, < -> LessThan, > -> GreaterThan) in ShapedBuffer.FindLeading/FindTrailingCharCountWithinWidth, TextPathSegmentEllipsis, and TextLeadingPrefixCharacterEllipsis. Also unify the DrawableTextRun branch of TextFormatterImpl.MeasureLength with the ShapedTextRun branch (>= -> GreaterThan) so the "whole run fits" boundary is identical for both run types: a run fits when width <= remaining (tolerant) and overflows only when strictly greater. Integer char-offset/index comparisons and the availableWidth <= 0 positivity guards are intentionally left as raw comparisons. * Cleanup some comments * Fix Split(0) crash in TextLeadingPrefixCharacterEllipsis suffix collection When a logical-tail run fits entirely within the remaining suffix budget, TryMeasureCharactersBackwards returns suffixCount == run.Length, so Split(run.Length - suffixCount) evaluated to Split(0), which throws ArgumentOutOfRangeException. This was reachable on multi-run lines whose post-split tail contains a small later run that fully fits. Guard the split on splitAt > 0 and use the whole run as-is when it fully fits (dropping it only when suffixCount == 0) — the same boundary pattern already applied to TextPathSegmentEllipsis. Add a multi-run regression test. * Remove duplicate ShapedBuffer.MeasureCharactersThatFit MeasureCharactersThatFit and FindLeadingCharCountWithinWidth ran the identical cluster-prefix binary search; the only functional difference was the unused `out widthConsumed`. Drop the former and repoint its callers (TextFormatterImpl.MeasureLength and the benchmark) at FindLeadingCharCountWithinWidth, which also unifies the availableWidth<=0 guard. The one test that asserted the consumed width now recovers it via GetCharRangeWidth(0, fit). Also tidy GetCharRangeWidth's simple-mode bounds to use Math.Clamp.	4 months ago
Benedikt Stebner	42bba0b859	[Text] Unicode and text layout optimizations (#21400 ) * perf(text): O(1) width queries on ShapedBuffer, cached LB-class lookup - ShapedBuffer: lazy, pooled cluster-prefix cache shared across Split; adds TotalGlyphAdvance / MeasureCharactersThatFit. - GlyphRun/TextFormatterImpl/Skia GlyphRunImpl: read the cache, drop duplicate scans; SplitTextRuns now returns firstLength via out. - LineBreakEnumerator: cache Next/PreviousClass per advance; remove unused LineBreakPairTable. - Tests + benchmarks for the new paths and a dotnet-trace harness. ~1.32x faster / -5% alloc on the emoji-wrap micro-benchmark; no observable behaviour or public API change. * perf(TextFormatting): inline LineBreakEnumerator rule dispatch Replace the BreakUnitDelegate[] s_rules array dispatch in LineBreakEnumerator.ExecuteRules with a sequence of direct static calls and a `goto Done` early-exit. This removes 42 indirect calls per codepoint and lets the JIT reason across rule boundaries, which in turn makes [MethodImpl(AggressiveInlining)] meaningful — JIT cannot inline through delegate.Invoke, so the attribute was a no-op in the previous shape. Selectively apply AggressiveInlining to the small single-condition rules (LB03, LB04, LB06, LB07, LB08a, LB11–LB15d, LB18, LB20, LB21b, LB22, LB29, LB31) and let the JIT decide on the larger ones to avoid bloating the merged ExecuteRules. The static BreakUnitDelegate[] s_rules array is removed. Benchmarks (BDN default job, --inProcess, N=13–22, rel. StdDev <1.5%): UnicodeBreakEnumeratorBenchmark.LineBreakEnumerator_Sequence Ascii 154.6 µs -> 24.84 µs (6.22x) Bmp 190.2 µs -> 32.81 µs (5.80x) Supplementary 227.6 µs -> 37.56 µs (6.06x) TextLayoutProfile.BuildEmojisWrapped Before (branch, pre-inline) 804.5 µs / 570.15 KB After (branch, post-inline) 547.0 µs / 570.15 KB (-32.0%) vs upstream/master (1061 µs) -> ~1.94x total speedup No allocation change; CPU-only dispatch reshape. All LineBreakEnumerator unit tests pass (5/5). * Refactor ShapedBuffer to share pool storage via IRef + generation counter Wrap the ArrayPool-rented glyph and cluster-cache arrays in a small PooledArray<T> disposable and expose them through IRef<T>. Split children and WithBidiLevel aliases now Clone() the refs instead of borrowing raw pool arrays, so the backing storage survives until every sibling has been disposed - eliminating the UAF risk that existed when a parent was disposed before its children. Add a per-glyph-holder generation counter (Volatile.Read / Interlocked .Increment). The indexer setter bumps the counter on every write, and EnsureClusterCache compares its recorded generation against the holder's current value, rebuilding on mismatch. This lets us drop the previous "no mutation after Split/WithBidiLevel" contract: mutations performed through any sibling now propagate to the others' caches transparently. Dispose is made idempotent via a _disposed guard so overlapping cache eviction and TextLine teardown only release the IRefs once. Adds ShapedBufferSharedStorageTests covering sibling lifetime, Dispose idempotency, and generation-driven cache invalidation across Split children and WithBidiLevel aliases. * test(ShapedBuffer): cover cluster-cache sharing across Split/WithBidiLevel aliases Add a regression test hook (`ClusterPrefix`) exposing the backing cluster-prefix array reference, plus two tests that mutate a parent buffer before aliasing it and assert the alias reuses the parent's pooled prefix array instead of rebuilding. Guards against forgetting to propagate `_cacheGeneration` to alias buffers, which would silently defeat the cached-split fast path. * Correctly use MathUtilities.LessThanOrClose --------- Co-authored-by: Julien Lebosquain <julien@lebosquain.net>	4 months ago
Benedikt Stebner	e8424283fe	Universal GlyphTypeface implementation (#19852 ) * Introduce a universal IGlyphTypeface implementation that does not rely on any platform implementation * Revert changes * Fix Android * Make the test happy * Fix build * Update baseline * Fix naming * Fix headless * Move interfaces to dedicated files Make GlyphTypeface.GlyphCount an integer * Fix GlyphCount * Make IGlyphTypeface NotClientImplementable * Make sure we cache platform typefaces by their desired name, style, weight and stretch * Update baseline * Only use IGlyphTypeface * Fix Android * Try to clear the buffer before we encode somethimg * Add needed test font * Add more unit tests * Reduce allocations * Remove Direct2D1 test files * More tests * More complete table implementations * More adjustments * Use batch APIs * Handle invalid timestamps * Update baseline * Introduce a CharacterToGlyphMap struct for faster access * Remove AggressiveInlining * Remove AggressiveInlining * Make the head table optional for legacy fonts * Remove Load method. Fix TextBlockTests * Fix nullables * Remove redundant folder * Update Api baseline * revert diff helper changes * revert changes * Use bare minimum font for Headless platform and introduce a test font manager that uses the Inter font for testing. * Add missing font file for Headless platform --------- Co-authored-by: Gillibald <stebner@avaloniaui.net> Co-authored-by: Julien Lebosquain <julien@lebosquain.net>	9 months ago
Julien Lebosquain	ee748802b3	Enable nullability in various test projects (#20374 ) * Enable nullability in RenderTests * Enable nullability in LeakTests * Enable nullability in Skia.UnitTests * Enable nullability in Generators.Tests * Enable nullability in DesignerSupport.Tests * Enable nullability in Build.Tasks.UnitTests	9 months ago
Benedikt Stebner	63690b5e78	Properly handle in cluster ShapedBuffer split (#19090 ) * Properly handle in cluster ShapedBuffer split * Allow ShapedBuffer split for empty text length --------- Co-authored-by: Julien Lebosquain <julien@lebosquain.net>	1 year ago
Benedikt Stebner	f307b7364a	Fix TextLineImp GetTextBounds Fix Tab character handling	4 years ago
Benedikt Stebner	edbfd96b2d	Simply ShapedBuffer GlyphInfos access	4 years ago
Julien Lebosquain	4144be11fe	Pass GlyphInfo directly to GlyphRun	4 years ago
Julien Lebosquain	dec8c1c586	Used Memory/Span instead of CharacterBufferReference/Range + GlyphRun uses ReadOnlyMemory for characters	4 years ago
Benedikt Stebner	895d85aa89	Implement CharacterBufferReference and related classes	4 years ago
Benedikt Stebner	9250d93407	Implement embedded runs Improve text edit navigation Implement IncrementalTabWidth	5 years ago
Benedikt Stebner	b815a22d5a	Port WPF's FormattedText to Avalonia and rework TextPresenter	5 years ago
Benedikt Stebner	9c3bfd2e92	Add failing test	5 years ago

14 Commits (main)