firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add external factories for @staticInterop classes instead of synthetic constructor (flutter/engine#37443)

Browse Source 
Per https://github.com/dart-lang/sdk/issues/49941, synthetic constructors
will be disallowed on @staticInterop classes. Functionally, they are lowered
to the same code.

Also fixes an erroneous call to the DomHTMLStyleConstructor instead of the
relevant factory method.
This commit is contained in:
Srujan Gaddam
2022-11-09 16:15:48 -08:00
committed by GitHub
parent 7cfbff8ff8
commit 540e92f91d
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
View File

@@ -1865,7 +1865,9 @@ class SkParagraphStyle {}
@JS()
@anonymous
@staticInterop
class SkParagraphStyleProperties {}
class SkParagraphStyleProperties {
external factory SkParagraphStyleProperties();
}
extension SkParagraphStylePropertiesExtension on SkParagraphStyleProperties {
external set textAlign(SkTextAlign? value);
@@ -1981,7 +1983,9 @@ SkPlaceholderAlignment toSkPlaceholderAlignment(
@JS()
@anonymous
@staticInterop
class SkTextStyleProperties {}
class SkTextStyleProperties {
external factory SkTextStyleProperties();
}
extension SkTextStylePropertiesExtension on SkTextStyleProperties {
external set backgroundColor(Float32List? value);
@@ -2008,7 +2012,9 @@ extension SkTextStylePropertiesExtension on SkTextStyleProperties {
@JS()
@anonymous
@staticInterop
class SkStrutStyleProperties {}
class SkStrutStyleProperties {
external factory SkStrutStyleProperties();
}
extension SkStrutStylePropertiesExtension on SkStrutStyleProperties {
external set fontFamilies(List<String>? value);
@@ -2024,7 +2030,9 @@ extension SkStrutStylePropertiesExtension on SkStrutStyleProperties {
@JS()
@anonymous
@staticInterop
class SkFontStyle {}
class SkFontStyle {
external factory SkFontStyle();
}
extension SkFontStyleExtension on SkFontStyle {
external set weight(SkFontWeight? value);
@@ -2034,7 +2042,9 @@ extension SkFontStyleExtension on SkFontStyle {
@JS()
@anonymous
@staticInterop
class SkTextShadow {}
class SkTextShadow {
external factory SkTextShadow();
}
extension SkTextShadowExtension on SkTextShadow {
external set color(Float32List? value);
@@ -2045,7 +2055,9 @@ extension SkTextShadowExtension on SkTextShadow {
@JS()
@anonymous
@staticInterop
class SkFontFeature {}
class SkFontFeature {
external factory SkFontFeature();
}
extension SkFontFeatureExtension on SkFontFeature {
external set name(String? value);
@@ -2055,7 +2067,9 @@ extension SkFontFeatureExtension on SkFontFeature {
@JS()
@anonymous
@staticInterop
class SkFontVariation {}
class SkFontVariation {
external factory SkFontVariation();
}
extension SkFontVariationExtension on SkFontVariation {
external set axis(String? value);

2
engine/src/flutter/lib/web_ui/lib/src/engine/text/font_collection.dart
View File

@@ -325,7 +325,7 @@ class _PolyfillFontManager extends FontManager {
final String fontFaceDeclaration = fontStyleMap.keys
.map((String name) => '$name: ${fontStyleMap[name]};')
.join(' ');
final DomHTMLStyleElement fontLoadStyle = DomHTMLStyleElement();
final DomHTMLStyleElement fontLoadStyle = createDomHTMLStyleElement();
fontLoadStyle.type = 'text/css';
fontLoadStyle.innerHtml = '@font-face { $fontFaceDeclaration }';
domDocument.head!.append(fontLoadStyle);