Commit 59933d2
committed
Extract the Skiko text backend into the ui-skiko module
Move the Skia-backed implementation of ui-text into ui-skiko, leaving
ui-text's nonAndroidMain Skia-free, mirroring the graphics extraction.
ui-text keeps expect/actual delegators resolving a registered
ComposeUiTextImplementation; the org.jetbrains.skia paragraph, font and
text-paint code lives in ui-skiko.
- Paragraph building, intrinsics, char helpers and the font subsystem
(FontFamilyResolver, font loading, PlatformFont) relocate to ui-skiko.
- The font subsystem is ui-text's own public API with per-platform
loadTypeface actuals, so the unavoidable public Skia-typed surface
stays in ui-text's skikoMain compat layer (Skia-free nonAndroidMain ->
Skia skikoMain -> platform leaves); only the implementation moves.
- ComposeUiSkikoRuntime.registerSkikoComposeImplementation() now wires
both the graphics and text implementations (plus the temporary
SkikoGraphicsCompat bridge).
API baselines are regenerated in a later commit.1 parent 785e275 commit 59933d2
57 files changed
Lines changed: 1978 additions & 1054 deletions
File tree
- compose/ui
- ui-skiko/src
- desktopMain/kotlin/androidx/compose/ui/text
- platform
- nativeMain/kotlin/androidx/compose/ui/text/platform
- nonAndroidMain/kotlin/androidx/compose/ui
- platform
- text
- font
- platform
- nonAndroidTest/kotlin/androidx/compose/ui
- skiko
- text
- platform
- nonJvmMain/kotlin/androidx/compose/ui/text
- webMain/kotlin/androidx/compose/ui/text/platform
- ui-text
- src
- darwinMain/kotlin/androidx/compose/ui/text/intl
- desktopMain/kotlin/androidx/compose/ui/text/intl
- desktopTest/kotlin/androidx/compose/ui/text
- nonAndroidMain/kotlin/androidx/compose/ui/text
- input
- intl
- platform
- style
- nonAndroidTest/kotlin/androidx/compose/ui/text
- input
- skikoMain/kotlin/androidx/compose/ui/text
- font
- platform
- webMain/kotlin/androidx/compose/ui/text/intl
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | 18 | | |
24 | 19 | | |
25 | 20 | | |
| |||
29 | 24 | | |
30 | 25 | | |
31 | 26 | | |
| 27 | + | |
32 | 28 | | |
33 | 29 | | |
34 | 30 | | |
| |||
41 | 37 | | |
42 | 38 | | |
43 | 39 | | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | 40 | | |
48 | 41 | | |
Lines changed: 48 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
Lines changed: 30 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| 17 | + | |
| 18 | + | |
17 | 19 | | |
18 | 20 | | |
19 | 21 | | |
| 22 | + | |
20 | 23 | | |
21 | 24 | | |
22 | 25 | | |
| |||
30 | 33 | | |
31 | 34 | | |
32 | 35 | | |
33 | | - | |
34 | | - | |
| 36 | + | |
| 37 | + | |
35 | 38 | | |
36 | 39 | | |
37 | 40 | | |
| |||
51 | 54 | | |
52 | 55 | | |
53 | 56 | | |
54 | | - | |
55 | | - | |
| 57 | + | |
| 58 | + | |
56 | 59 | | |
57 | 60 | | |
58 | 61 | | |
59 | | - | |
| 62 | + | |
60 | 63 | | |
61 | 64 | | |
62 | 65 | | |
| |||
77 | 80 | | |
78 | 81 | | |
79 | 82 | | |
80 | | - | |
| 83 | + | |
81 | 84 | | |
82 | 85 | | |
83 | 86 | | |
84 | | - | |
| 87 | + | |
85 | 88 | | |
86 | 89 | | |
87 | 90 | | |
| |||
160 | 163 | | |
161 | 164 | | |
162 | 165 | | |
163 | | - | |
| 166 | + | |
164 | 167 | | |
165 | 168 | | |
166 | 169 | | |
| |||
184 | 187 | | |
185 | 188 | | |
186 | 189 | | |
187 | | - | |
| 190 | + | |
188 | 191 | | |
189 | 192 | | |
190 | 193 | | |
| |||
229 | 232 | | |
230 | 233 | | |
231 | 234 | | |
232 | | - | |
| 235 | + | |
233 | 236 | | |
234 | 237 | | |
235 | 238 | | |
236 | 239 | | |
237 | 240 | | |
238 | | - | |
| 241 | + | |
239 | 242 | | |
240 | 243 | | |
241 | 244 | | |
| |||
440 | 443 | | |
441 | 444 | | |
442 | 445 | | |
443 | | - | |
444 | | - | |
| 446 | + | |
| 447 | + | |
445 | 448 | | |
446 | 449 | | |
447 | 450 | | |
| |||
541 | 544 | | |
542 | 545 | | |
543 | 546 | | |
544 | | - | |
| 547 | + | |
545 | 548 | | |
546 | 549 | | |
547 | 550 | | |
| |||
661 | 664 | | |
662 | 665 | | |
663 | 666 | | |
664 | | - | |
| 667 | + | |
665 | 668 | | |
666 | 669 | | |
667 | 670 | | |
| |||
673 | 676 | | |
674 | 677 | | |
675 | 678 | | |
| 679 | + | |
676 | 680 | | |
677 | 681 | | |
678 | 682 | | |
| |||
687 | 691 | | |
688 | 692 | | |
689 | 693 | | |
| 694 | + | |
690 | 695 | | |
691 | 696 | | |
692 | 697 | | |
| |||
725 | 730 | | |
726 | 731 | | |
727 | 732 | | |
728 | | - | |
| 733 | + | |
729 | 734 | | |
730 | 735 | | |
731 | 736 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
48 | 47 | | |
49 | 48 | | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | 49 | | |
54 | 50 | | |
55 | 51 | | |
56 | 52 | | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | 53 | | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | 54 | | |
66 | 55 | | |
67 | 56 | | |
68 | 57 | | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | 58 | | |
73 | 59 | | |
74 | 60 | | |
75 | 61 | | |
76 | 62 | | |
77 | 63 | | |
78 | 64 | | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | 65 | | |
84 | 66 | | |
85 | 67 | | |
| |||
90 | 72 | | |
91 | 73 | | |
92 | 74 | | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | 75 | | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | 76 | | |
104 | 77 | | |
105 | 78 | | |
| |||
126 | 99 | | |
127 | 100 | | |
128 | 101 | | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | 102 | | |
133 | 103 | | |
134 | 104 | | |
| |||
140 | 110 | | |
141 | 111 | | |
142 | 112 | | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | 113 | | |
147 | 114 | | |
148 | 115 | | |
| |||
0 commit comments