@@ -14,7 +14,6 @@ internal struct LayerWireframeBuilder {
1414 typealias TextInputSemantics = CALayerSnapshot . SemanticObservation . TextInputSemantics
1515
1616 struct Output {
17- let id : Int64
1817 let wireframe : SRWireframe
1918 let resource : Resource ?
2019 }
@@ -43,7 +42,6 @@ internal struct LayerWireframeBuilder {
4342 ) -> Output ? {
4443 guard !snapshot. isPrivate else {
4544 return Output (
46- id: snapshot. replayID,
4745 wireframe: SRWireframe ( placeholderFor: snapshot, label: . hiddenPlaceholder) ,
4846 resource: nil
4947 )
@@ -63,43 +61,41 @@ internal struct LayerWireframeBuilder {
6361 )
6462 case ( . layer, . none) :
6563 return SRWireframe ( layerSnapshot: snapshot, cornerRadius: cornerRadius)
66- . map { Output ( id : snapshot . replayID , wireframe: $0, resource: nil ) }
64+ . map { Output ( wireframe: $0, resource: nil ) }
6765 case ( . gradient( let gradient) , _) :
6866 return SRWireframe (
6967 layerSnapshot: snapshot,
7068 backgroundGradient: SRShapeGradient ( gradient: gradient) ,
7169 cornerRadius: cornerRadius
72- ) . map { Output ( id : snapshot . replayID , wireframe: $0, resource: nil ) }
70+ ) . map { Output ( wireframe: $0, resource: nil ) }
7371 case ( . label( let label) , _) :
7472 return SRWireframe (
7573 layerSnapshot: snapshot,
7674 label: label,
7775 cornerRadius: cornerRadius
78- ) . map { Output ( id : snapshot . replayID , wireframe: $0, resource: nil ) }
76+ ) . map { Output ( wireframe: $0, resource: nil ) }
7977 case ( . textInput, . none) :
8078 return SRWireframe ( layerSnapshot: snapshot, cornerRadius: cornerRadius)
81- . map { Output ( id : snapshot . replayID , wireframe: $0, resource: nil ) }
79+ . map { Output ( wireframe: $0, resource: nil ) }
8280 case ( . image( let image) , . none) where image. hasContent:
8381 let wireframe = SRWireframe (
8482 placeholderFor: snapshot,
8583 label: snapshot. imagePrivacyLevel == . maskNonBundledOnly
8684 ? . contentImagePlaceholder
8785 : . imagePlaceholder
8886 )
89- return Output ( id : snapshot . replayID , wireframe: wireframe, resource: nil )
87+ return Output ( wireframe: wireframe, resource: nil )
9088 case ( . image, . none) :
9189 return SRWireframe ( layerSnapshot: snapshot, cornerRadius: cornerRadius)
92- . map { Output ( id : snapshot . replayID , wireframe: $0, resource: nil ) }
90+ . map { Output ( wireframe: $0, resource: nil ) }
9391 case ( . webView( let webView) , _) :
9492 pendingWebViewSlotIDs. remove ( webView. slotID)
9593 return Output (
96- id: Int64 ( webView. slotID) ,
9794 wireframe: SRWireframe ( layerSnapshot: snapshot, webView: webView) ,
9895 resource: nil
9996 )
10097 case ( . visualEffect( . automaticCapsule) , _) :
10198 return Output (
102- id: snapshot. replayID,
10399 wireframe: SRWireframe (
104100 layerSnapshot: snapshot,
105101 backgroundColor: . systemBackground,
@@ -109,19 +105,16 @@ internal struct LayerWireframeBuilder {
109105 )
110106 case ( . visualEffect( . glassGroup) , _) where snapshot. cornerRadii != . zero:
111107 return Output (
112- id: snapshot. replayID,
113108 wireframe: SRWireframe ( layerSnapshot: snapshot, backgroundColor: . systemBackground) ,
114109 resource: nil
115110 )
116111 case ( . visualEffect( . backdrop) , _) :
117112 return Output (
118- id: snapshot. replayID,
119113 wireframe: SRWireframe ( layerSnapshot: snapshot, backgroundColor: . systemBackground) ,
120114 resource: nil
121115 )
122116 case ( . visualEffect( . background( let color) ) , _) :
123117 return Output (
124- id: snapshot. replayID,
125118 wireframe: SRWireframe (
126119 layerSnapshot: snapshot,
127120 backgroundColor: color ?? . secondarySystemFill
@@ -133,7 +126,7 @@ internal struct LayerWireframeBuilder {
133126 return nil
134127 }
135128 return SRWireframe ( layerSnapshot: snapshot, backgroundGradient: gradient)
136- . map { Output ( id : snapshot . replayID , wireframe: $0, resource: nil ) }
129+ . map { Output ( wireframe: $0, resource: nil ) }
137130 default :
138131 return nil
139132 }
@@ -158,17 +151,15 @@ internal struct LayerWireframeBuilder {
158151 case . image( let image) :
159152 let resource = ImageSnapshotResource ( image: image)
160153 return Output (
161- id: layerSnapshot. replayID,
162154 wireframe: SRWireframe (
163- id : layerSnapshot. replayID,
155+ replayID : layerSnapshot. replayID,
164156 imageSnapshot: imageSnapshot,
165157 resource: resource
166158 ) ,
167159 resource: resource
168160 )
169161 case . placeholder( let color) :
170162 return Output (
171- id: layerSnapshot. replayID,
172163 wireframe: SRWireframe (
173164 layerSnapshot: layerSnapshot,
174165 backgroundColor: color,
@@ -179,7 +170,6 @@ internal struct LayerWireframeBuilder {
179170 }
180171 } catch {
181172 return Output (
182- id: layerSnapshot. replayID,
183173 wireframe: SRWireframe (
184174 placeholderFor: layerSnapshot,
185175 label: . redactedPlaceholder
@@ -189,7 +179,6 @@ internal struct LayerWireframeBuilder {
189179 }
190180 case . failure( . timedOut) :
191181 return Output (
192- id: layerSnapshot. replayID,
193182 wireframe: SRWireframe (
194183 placeholderFor: layerSnapshot,
195184 label: . timedOutPlaceholder
0 commit comments