Skip to content

Commit 63581b6

Browse files
joshualittjustinmc
authored andcommitted
[web] Migrate Flutter Web to JS static interop - 4. (flutter#32466)
1 parent 5176d4a commit 63581b6

File tree

1 file changed

+45
-11
lines changed

1 file changed

+45
-11
lines changed

lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart

+45-11
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ abstract class H5vcc {
6161

6262
@JS()
6363
@anonymous
64-
class CanvasKit {
64+
@staticInterop
65+
class CanvasKit {}
66+
67+
extension CanvasKitExtension on CanvasKit {
6568
external SkBlendModeEnum get BlendMode;
6669
external SkPaintStyleEnum get PaintStyle;
6770
external SkStrokeCapEnum get StrokeCap;
@@ -191,6 +194,7 @@ extension CanvasKitInitPromiseExtension on CanvasKitInitPromise {
191194
external ColorSpace get SkColorSpaceSRGB;
192195

193196
@JS()
197+
@staticInterop
194198
class ColorSpace {}
195199

196200
@JS()
@@ -229,13 +233,19 @@ extension SkGrContextExtension on SkGrContext {
229233

230234
@JS()
231235
@anonymous
232-
class SkFontSlantEnum {
236+
@staticInterop
237+
class SkFontSlantEnum {}
238+
239+
extension SkFontSlantEnumExtension on SkFontSlantEnum {
233240
external SkFontSlant get Upright;
234241
external SkFontSlant get Italic;
235242
}
236243

237244
@JS('window.flutterCanvasKit.FontSlant')
238-
class SkFontSlant {
245+
@staticInterop
246+
class SkFontSlant {}
247+
248+
extension SkFontSlantExtension on SkFontSlant {
239249
external int get value;
240250
}
241251

@@ -250,7 +260,10 @@ SkFontSlant toSkFontSlant(ui.FontStyle style) {
250260

251261
@JS()
252262
@anonymous
253-
class SkFontWeightEnum {
263+
@staticInterop
264+
class SkFontWeightEnum {}
265+
266+
extension SkFontWeightEnumExtension on SkFontWeightEnum {
254267
external SkFontWeight get Thin;
255268
external SkFontWeight get ExtraLight;
256269
external SkFontWeight get Light;
@@ -263,7 +276,10 @@ class SkFontWeightEnum {
263276
}
264277

265278
@JS()
266-
class SkFontWeight {
279+
@staticInterop
280+
class SkFontWeight {}
281+
282+
extension SkFontWeightExtension on SkFontWeight {
267283
external int get value;
268284
}
269285

@@ -284,13 +300,19 @@ SkFontWeight toSkFontWeight(ui.FontWeight weight) {
284300
}
285301

286302
@JS()
287-
class SkAffinityEnum {
303+
@staticInterop
304+
class SkAffinityEnum {}
305+
306+
extension SkAffinityEnumExtension on SkAffinityEnum {
288307
external SkAffinity get Upstream;
289308
external SkAffinity get Downstream;
290309
}
291310

292311
@JS()
293-
class SkAffinity {
312+
@staticInterop
313+
class SkAffinity {}
314+
315+
extension SkAffinityExtension on SkAffinity {
294316
external int get value;
295317
}
296318

@@ -304,13 +326,19 @@ SkAffinity toSkAffinity(ui.TextAffinity affinity) {
304326
}
305327

306328
@JS()
307-
class SkTextDirectionEnum {
329+
@staticInterop
330+
class SkTextDirectionEnum {}
331+
332+
extension SkTextDirectionEnumExtension on SkTextDirectionEnum {
308333
external SkTextDirection get RTL;
309334
external SkTextDirection get LTR;
310335
}
311336

312337
@JS()
313-
class SkTextDirection {
338+
@staticInterop
339+
class SkTextDirection {}
340+
341+
extension SkTextDirectionExtension on SkTextDirection {
314342
external int get value;
315343
}
316344

@@ -326,7 +354,10 @@ SkTextDirection toSkTextDirection(ui.TextDirection direction) {
326354
}
327355

328356
@JS()
329-
class SkTextAlignEnum {
357+
@staticInterop
358+
class SkTextAlignEnum {}
359+
360+
extension SkTextAlignEnumExtension on SkTextAlignEnum {
330361
external SkTextAlign get Left;
331362
external SkTextAlign get Right;
332363
external SkTextAlign get Center;
@@ -336,7 +367,10 @@ class SkTextAlignEnum {
336367
}
337368

338369
@JS()
339-
class SkTextAlign {
370+
@staticInterop
371+
class SkTextAlign {}
372+
373+
extension SkTextAlignExtension on SkTextAlign {
340374
external int get value;
341375
}
342376

0 commit comments

Comments
 (0)