@@ -50,11 +50,15 @@ std::vector<DisplayListInvocationGroup> CreateAllAttributesOps() {
50
50
{" SetAntiAlias" ,
51
51
{
52
52
{0 , 8 , 0 , [](DlOpReceiver& r) { r.setAntiAlias (true ); }},
53
+
54
+ // Reset attribute to default as last entry
53
55
{0 , 0 , 0 , [](DlOpReceiver& r) { r.setAntiAlias (false ); }},
54
56
}},
55
57
{" SetInvertColors" ,
56
58
{
57
59
{0 , 8 , 0 , [](DlOpReceiver& r) { r.setInvertColors (true ); }},
60
+
61
+ // Reset attribute to default as last entry
58
62
{0 , 0 , 0 , [](DlOpReceiver& r) { r.setInvertColors (false ); }},
59
63
}},
60
64
{" SetStrokeCap" ,
@@ -63,6 +67,8 @@ std::vector<DisplayListInvocationGroup> CreateAllAttributesOps() {
63
67
[](DlOpReceiver& r) { r.setStrokeCap (DlStrokeCap::kRound ); }},
64
68
{0 , 8 , 0 ,
65
69
[](DlOpReceiver& r) { r.setStrokeCap (DlStrokeCap::kSquare ); }},
70
+
71
+ // Reset attribute to default as last entry
66
72
{0 , 0 , 0 ,
67
73
[](DlOpReceiver& r) { r.setStrokeCap (DlStrokeCap::kButt ); }},
68
74
}},
@@ -72,6 +78,8 @@ std::vector<DisplayListInvocationGroup> CreateAllAttributesOps() {
72
78
[](DlOpReceiver& r) { r.setStrokeJoin (DlStrokeJoin::kBevel ); }},
73
79
{0 , 8 , 0 ,
74
80
[](DlOpReceiver& r) { r.setStrokeJoin (DlStrokeJoin::kRound ); }},
81
+
82
+ // Reset attribute to default as last entry
75
83
{0 , 0 , 0 ,
76
84
[](DlOpReceiver& r) { r.setStrokeJoin (DlStrokeJoin::kMiter ); }},
77
85
}},
@@ -83,19 +91,25 @@ std::vector<DisplayListInvocationGroup> CreateAllAttributesOps() {
83
91
[](DlOpReceiver& r) {
84
92
r.setDrawStyle (DlDrawStyle::kStrokeAndFill );
85
93
}},
94
+
95
+ // Reset attribute to default as last entry
86
96
{0 , 0 , 0 ,
87
97
[](DlOpReceiver& r) { r.setDrawStyle (DlDrawStyle::kFill ); }},
88
98
}},
89
99
{" SetStrokeWidth" ,
90
100
{
91
101
{0 , 8 , 0 , [](DlOpReceiver& r) { r.setStrokeWidth (1.0 ); }},
92
102
{0 , 8 , 0 , [](DlOpReceiver& r) { r.setStrokeWidth (5.0 ); }},
103
+
104
+ // Reset attribute to default as last entry
93
105
{0 , 0 , 0 , [](DlOpReceiver& r) { r.setStrokeWidth (0.0 ); }},
94
106
}},
95
107
{" SetStrokeMiter" ,
96
108
{
97
109
{0 , 8 , 0 , [](DlOpReceiver& r) { r.setStrokeMiter (0.0 ); }},
98
110
{0 , 8 , 0 , [](DlOpReceiver& r) { r.setStrokeMiter (5.0 ); }},
111
+
112
+ // Reset attribute to default as last entry
99
113
{0 , 0 , 0 , [](DlOpReceiver& r) { r.setStrokeMiter (4.0 ); }},
100
114
}},
101
115
{" SetColor" ,
@@ -104,6 +118,8 @@ std::vector<DisplayListInvocationGroup> CreateAllAttributesOps() {
104
118
[](DlOpReceiver& r) { r.setColor (DlColor (SK_ColorGREEN)); }},
105
119
{0 , 8 , 0 ,
106
120
[](DlOpReceiver& r) { r.setColor (DlColor (SK_ColorBLUE)); }},
121
+
122
+ // Reset attribute to default as last entry
107
123
{0 , 0 , 0 ,
108
124
[](DlOpReceiver& r) { r.setColor (DlColor (SK_ColorBLACK)); }},
109
125
}},
@@ -113,6 +129,8 @@ std::vector<DisplayListInvocationGroup> CreateAllAttributesOps() {
113
129
[](DlOpReceiver& r) { r.setBlendMode (DlBlendMode::kSrcIn ); }},
114
130
{0 , 8 , 0 ,
115
131
[](DlOpReceiver& r) { r.setBlendMode (DlBlendMode::kDstIn ); }},
132
+
133
+ // Reset attribute to default as last entry
116
134
{0 , 0 , 0 ,
117
135
[](DlOpReceiver& r) { r.setBlendMode (DlBlendMode::kSrcOver ); }},
118
136
}},
@@ -128,6 +146,8 @@ std::vector<DisplayListInvocationGroup> CreateAllAttributesOps() {
128
146
[](DlOpReceiver& r) { r.setColorSource (kTestSource4 .get ()); }},
129
147
{0 , 80 + 6 * 4 , 0 ,
130
148
[](DlOpReceiver& r) { r.setColorSource (kTestSource5 .get ()); }},
149
+
150
+ // Reset attribute to default as last entry
131
151
{0 , 0 , 0 , [](DlOpReceiver& r) { r.setColorSource (nullptr ); }},
132
152
}},
133
153
{" SetImageFilter" ,
@@ -186,14 +206,16 @@ std::vector<DisplayListInvocationGroup> CreateAllAttributesOps() {
186
206
[](DlOpReceiver& r) { r.setImageFilter (&kTestCFImageFilter1 ); }},
187
207
{0 , 24 , 0 ,
188
208
[](DlOpReceiver& r) { r.setImageFilter (&kTestCFImageFilter2 ); }},
189
- {0 , 0 , 0 , [](DlOpReceiver& r) { r.setImageFilter (nullptr ); }},
190
209
{0 , 24 , 0 ,
191
210
[](DlOpReceiver& r) {
192
211
r.setImageFilter (
193
212
kTestBlurImageFilter1
194
213
.makeWithLocalMatrix (SkMatrix::Translate (2 , 2 ))
195
214
.get ());
196
215
}},
216
+
217
+ // Reset attribute to default as last entry
218
+ {0 , 0 , 0 , [](DlOpReceiver& r) { r.setImageFilter (nullptr ); }},
197
219
}},
198
220
{" SetColorFilter" ,
199
221
{
@@ -219,6 +241,8 @@ std::vector<DisplayListInvocationGroup> CreateAllAttributesOps() {
219
241
[](DlOpReceiver& r) {
220
242
r.setColorFilter (DlLinearToSrgbGammaColorFilter::kInstance .get ());
221
243
}},
244
+
245
+ // Reset attribute to default as last entry
222
246
{0 , 0 , 0 , [](DlOpReceiver& r) { r.setColorFilter (nullptr ); }},
223
247
}},
224
248
{" SetMaskFilter" ,
@@ -238,6 +262,8 @@ std::vector<DisplayListInvocationGroup> CreateAllAttributesOps() {
238
262
{0 , 32 , 0 ,
239
263
[](DlOpReceiver& r) { r.setMaskFilter (&kTestMaskFilter5 ); }, 0u ,
240
264
2u },
265
+
266
+ // Reset attribute to default as last entry
241
267
{0 , 0 , 0 , [](DlOpReceiver& r) { r.setMaskFilter (nullptr ); }, 0u , 1u },
242
268
}},
243
269
};
0 commit comments