@@ -3,25 +3,25 @@ import 'dart:convert';
33import 'dart:typed_data' ;
44
55import 'package:meta/meta.dart' ;
6- import 'tessellator.dart' ;
7- import 'masking_optimizer.dart' ;
8- import 'clipping_optimizer.dart' ;
9- import 'overdraw_optimizer.dart' ;
10- import 'path_ops.dart' as path_ops;
116import 'package:xml/xml_events.dart' ;
127
138import '../geometry/basic_types.dart' ;
149import '../geometry/matrix.dart' ;
1510import '../geometry/path.dart' ;
1611import '../paint.dart' ;
1712import '../vector_instructions.dart' ;
13+ import 'clipping_optimizer.dart' ;
1814import 'colors.dart' ;
15+ import 'masking_optimizer.dart' ;
1916import 'node.dart' ;
2017import 'numbers.dart' hide parseDoubleWithUnits;
2118import 'numbers.dart' as numbers show parseDoubleWithUnits;
2219import 'opacity_peephole.dart' ;
20+ import 'overdraw_optimizer.dart' ;
2321import 'parsers.dart' ;
22+ import 'path_ops.dart' as path_ops;
2423import 'resolver.dart' ;
24+ import 'tessellator.dart' ;
2525import 'theme.dart' ;
2626import 'visitor.dart' ;
2727
@@ -1505,7 +1505,6 @@ class SvgParser {
15051505 return null ;
15061506 }
15071507
1508- Paint ? definitionPaint;
15091508 Color ? strokeColor;
15101509 String ? shaderId;
15111510 bool ? hasPattern;
@@ -1522,14 +1521,11 @@ class SvgParser {
15221521 return SvgStrokeAttributes ._(
15231522 _definitions,
15241523 shaderId: shaderId,
1525- color: (strokeColor ?? currentColor ?? definitionPaint? .stroke? .color)
1526- ? .withOpacity (opacity),
1527- cap: _parseCap (rawStrokeCap, definitionPaint? .stroke),
1528- join: _parseJoin (rawLineJoin, definitionPaint? .stroke),
1529- miterLimit:
1530- parseDouble (rawMiterLimit) ?? definitionPaint? .stroke? .miterLimit,
1531- width: parseDoubleWithUnits (rawStrokeWidth) ??
1532- definitionPaint? .stroke? .width,
1524+ color: (strokeColor ?? currentColor)? .withOpacity (opacity),
1525+ cap: _parseCap (rawStrokeCap, null ),
1526+ join: _parseJoin (rawLineJoin, null ),
1527+ miterLimit: parseDouble (rawMiterLimit),
1528+ width: parseDoubleWithUnits (rawStrokeWidth),
15331529 dashArray: _parseDashArray (rawStrokeDashArray),
15341530 dashOffset: _parseDashOffset (rawStrokeDashOffset),
15351531 hasPattern: hasPattern,
@@ -1634,6 +1630,7 @@ class _Resolver {
16341630 final Map <String , List <Node >> _clips = < String , List <Node >> {};
16351631
16361632 bool _sealed = false ;
1633+
16371634 void _seal () {
16381635 assert (_deferredShaders.isEmpty);
16391636 _sealed = true ;
0 commit comments