@@ -22,7 +22,7 @@ use crate::{
22
22
error:: Error ,
23
23
features:: resolve_variable_metric,
24
24
orchestration:: {
25
- AnyWorkId , BeWork , Context , KernAdjustments , KernSegment , Kerning , Kerns , PairPosEntry ,
25
+ AnyWorkId , BeWork , Context , KernAdjustments , KernFragment , Kerning , Kerns , PairPosEntry ,
26
26
WorkId ,
27
27
} ,
28
28
} ;
@@ -32,18 +32,18 @@ use crate::{
32
32
const KERNS_PER_BLOCK : usize = 2048 ;
33
33
34
34
#[ derive( Debug ) ]
35
- struct KerningWork ;
35
+ struct GatherIrKerningWork ;
36
36
37
37
#[ derive( Debug ) ]
38
- struct KerningSegmentWork {
38
+ struct KerningFragmentWork {
39
39
segment : usize ,
40
40
}
41
41
42
42
#[ derive( Debug ) ]
43
43
struct KerningGatherWork ;
44
44
45
- pub fn create_kerning_work ( ) -> Box < BeWork > {
46
- Box :: new ( KerningWork { } )
45
+ pub fn create_gather_ir_kerning_work ( ) -> Box < BeWork > {
46
+ Box :: new ( GatherIrKerningWork { } )
47
47
}
48
48
49
49
pub fn create_kern_segment_work ( kern_pairs : & Kerning ) -> Vec < Box < BeWork > > {
@@ -55,7 +55,7 @@ pub fn create_kern_segment_work(kern_pairs: &Kerning) -> Vec<Box<BeWork>> {
55
55
segments
56
56
) ;
57
57
for segment in 0 ..segments {
58
- work. push ( Box :: new ( KerningSegmentWork { segment } ) ) ;
58
+ work. push ( Box :: new ( KerningFragmentWork { segment } ) ) ;
59
59
}
60
60
work
61
61
}
@@ -71,9 +71,9 @@ fn gid(glyph_order: &GlyphOrder, name: &GlyphName) -> Result<GlyphId, Error> {
71
71
. ok_or_else ( || Error :: MissingGlyphId ( name. clone ( ) ) )
72
72
}
73
73
74
- impl Work < Context , AnyWorkId , Error > for KerningWork {
74
+ impl Work < Context , AnyWorkId , Error > for GatherIrKerningWork {
75
75
fn id ( & self ) -> AnyWorkId {
76
- WorkId :: KernPairs . into ( )
76
+ WorkId :: GatherIrKerning . into ( )
77
77
}
78
78
79
79
fn read_access ( & self ) -> Access < AnyWorkId > {
@@ -85,7 +85,7 @@ impl Work<Context, AnyWorkId, Error> for KerningWork {
85
85
}
86
86
87
87
fn write_access ( & self ) -> Access < AnyWorkId > {
88
- Access :: Variant ( WorkId :: KernPairs . into ( ) )
88
+ Access :: Variant ( WorkId :: GatherIrKerning . into ( ) )
89
89
}
90
90
91
91
/// Generate kerning data structures.
@@ -142,15 +142,15 @@ impl Work<Context, AnyWorkId, Error> for KerningWork {
142
142
}
143
143
}
144
144
145
- impl Work < Context , AnyWorkId , Error > for KerningSegmentWork {
145
+ impl Work < Context , AnyWorkId , Error > for KerningFragmentWork {
146
146
fn id ( & self ) -> AnyWorkId {
147
- WorkId :: KernSegment ( self . segment ) . into ( )
147
+ WorkId :: KernFragment ( self . segment ) . into ( )
148
148
}
149
149
150
150
fn read_access ( & self ) -> Access < AnyWorkId > {
151
151
AccessBuilder :: new ( )
152
152
. variant ( FeWorkId :: StaticMetadata )
153
- . variant ( WorkId :: KernPairs )
153
+ . variant ( WorkId :: GatherIrKerning )
154
154
. build ( )
155
155
}
156
156
@@ -238,7 +238,7 @@ impl Work<Context, AnyWorkId, Error> for KerningSegmentWork {
238
238
}
239
239
}
240
240
241
- context. kern_segments . set ( KernSegment {
241
+ context. kern_segments . set ( KernFragment {
242
242
segment : self . segment ,
243
243
kerns,
244
244
} ) ;
@@ -249,13 +249,13 @@ impl Work<Context, AnyWorkId, Error> for KerningSegmentWork {
249
249
250
250
impl Work < Context , AnyWorkId , Error > for KerningGatherWork {
251
251
fn id ( & self ) -> AnyWorkId {
252
- WorkId :: Kerns . into ( )
252
+ WorkId :: GatherBeKerning . into ( )
253
253
}
254
254
255
255
fn read_access ( & self ) -> Access < AnyWorkId > {
256
256
AccessBuilder :: new ( )
257
- . variant ( WorkId :: KernPairs ) // wait for pairs because kern segments don't spawn until pairs are done
258
- . variant ( WorkId :: KernSegment ( 0 ) )
257
+ . variant ( WorkId :: GatherIrKerning ) // wait for pairs because kern segments don't spawn until pairs are done
258
+ . variant ( WorkId :: KernFragment ( 0 ) )
259
259
. build ( )
260
260
}
261
261
0 commit comments