Repository navigation
Commit 5441168
authored
Make ReactFontManager caches thread-safe
Summary:
`ReactFontManager` keeps registered custom fonts and cached asset typefaces in plain maps and a `SparseArray` with no synchronization, but it is used from several threads at once:
- Text measurement reads it on whichever thread calls `FabricUIManager.measure`, which is `AnyThread`.
- Text spans and `ReactEditText` read it on the UI thread.
- Apps can call `addCustomFont` from a background thread at any time, for example once a downloaded font file is ready.
- `getTypeface()` itself writes the asset cache during a lookup.
Concurrent use can drop entries, throw `ConcurrentModificationException` from `customFontFamilies`, or leave a reader with a stale or corrupted map.
This switches both maps to `ConcurrentHashMap`, creates asset-family entries with `computeIfAbsent`, reads a custom font with one `get` instead of `containsKey` then `get`, and synchronizes the small per-family `SparseArray`.
Behavior is otherwise unchanged. The maps never held null values (`addCustomFont` already ignores null), and the public API is the same. `ConcurrentHashMap` publishes each write to later readers, `computeIfAbsent` is available at the minimum SDK (24), and no lock is held while a typeface is created. Two threads that miss the asset cache at the same time can still both create the same typeface, with the last write kept, as before.
Changelog:
[Android][Fixed] - Make `ReactFontManager` safe to use from multiple threads
Differential Revision: D129482043
Pull Request resolved: #599001 parent 339e09f commit 5441168
2 files changed
Lines changed: 86 additions & 7 deletions
File tree
- packages/react-native/ReactAndroid/src
- main/java/com/facebook/react/common/assets
- test/java/com/facebook/react/common/assets
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
19 | 20 | | |
20 | 21 | | |
21 | 22 | | |
| |||
32 | 33 | | |
33 | 34 | | |
34 | 35 | | |
35 | | - | |
36 | | - | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
37 | 39 | | |
38 | 40 | | |
39 | 41 | | |
| |||
64 | 66 | | |
65 | 67 | | |
66 | 68 | | |
67 | | - | |
| 69 | + | |
| 70 | + | |
68 | 71 | | |
69 | 72 | | |
70 | | - | |
| 73 | + | |
71 | 74 | | |
72 | 75 | | |
73 | | - | |
| 76 | + | |
74 | 77 | | |
75 | 78 | | |
76 | 79 | | |
| |||
109 | 112 | | |
110 | 113 | | |
111 | 114 | | |
112 | | - | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
113 | 118 | | |
114 | 119 | | |
115 | 120 | | |
| |||
205 | 210 | | |
206 | 211 | | |
207 | 212 | | |
208 | | - | |
| 213 | + | |
209 | 214 | | |
| 215 | + | |
210 | 216 | | |
211 | 217 | | |
212 | 218 | | |
| |||
| 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 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
0 commit comments