|
1 diff -rup firefox-80.0.1.orig/gfx/skia/skia/include/codec/SkEncodedOrigin.h firefox-80.0.1/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
|
2 --- firefox-80.0.1.orig/gfx/skia/skia/include/codec/SkEncodedOrigin.h 2020-08-31 16:04:09.000000000 +0200 |
|
3 +++ firefox-80.0.1/gfx/skia/skia/include/codec/SkEncodedOrigin.h 2020-09-05 17:20:04.093066839 +0200 |
|
4 @@ -41,6 +41,7 @@ static inline SkMatrix SkEncodedOriginTo |
|
5 case kLeftBottom_SkEncodedOrigin: return SkMatrix::MakeAll( 0, 1, 0, -1, 0, w, 0, 0, 1); |
|
6 } |
|
7 SK_ABORT("Unexpected origin"); |
|
8 + SkUNREACHABLE; |
|
9 } |
|
10 |
|
11 |
|
12 diff -rup firefox-80.0.1.orig/gfx/skia/skia/include/private/GrTypesPriv.h firefox-80.0.1/gfx/skia/skia/include/private/GrTypesPriv.h |
|
13 --- firefox-80.0.1.orig/gfx/skia/skia/include/private/GrTypesPriv.h 2020-08-31 16:04:09.000000000 +0200 |
|
14 +++ firefox-80.0.1/gfx/skia/skia/include/private/GrTypesPriv.h 2020-09-05 16:27:55.719487864 +0200 |
|
15 @@ -540,6 +540,7 @@ static inline GrSLType GrSLCombinedSampl |
|
16 default: |
|
17 SK_ABORT("Unexpected texture type"); |
|
18 } |
|
19 + SkUNREACHABLE; |
|
20 } |
|
21 |
|
22 /** Rectangle and external textures only support the clamp wrap mode and do not support |
|
23 @@ -556,6 +557,7 @@ static inline bool GrTextureTypeHasRestr |
|
24 default: |
|
25 SK_ABORT("Unexpected texture type"); |
|
26 } |
|
27 + SkUNREACHABLE; |
|
28 } |
|
29 |
|
30 static constexpr bool GrSLTypeIsCombinedSamplerType(GrSLType type) { |
|
31 @@ -858,6 +860,7 @@ static inline size_t GrCompressedFormatD |
|
32 } |
|
33 |
|
34 SK_ABORT("Invalid pixel config"); |
|
35 + SkUNREACHABLE; |
|
36 } |
|
37 |
|
38 /** |
|
39 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/core/SkGeometry.h firefox-80.0.1/gfx/skia/skia/src/core/SkGeometry.h |
|
40 --- firefox-80.0.1.orig/gfx/skia/skia/src/core/SkGeometry.h 2020-08-31 16:04:09.000000000 +0200 |
|
41 +++ firefox-80.0.1/gfx/skia/skia/src/core/SkGeometry.h 2020-09-05 17:33:51.896635366 +0200 |
|
42 @@ -182,6 +182,7 @@ static inline bool SkCubicIsDegenerate(S |
|
43 return true; |
|
44 } |
|
45 SK_ABORT("Invalid SkCubicType"); |
|
46 + SkUNREACHABLE; |
|
47 } |
|
48 |
|
49 static inline const char* SkCubicTypeName(SkCubicType type) { |
|
50 @@ -194,6 +195,7 @@ static inline const char* SkCubicTypeNam |
|
51 case SkCubicType::kLineOrPoint: return "kLineOrPoint"; |
|
52 } |
|
53 SK_ABORT("Invalid SkCubicType"); |
|
54 + SkUNREACHABLE; |
|
55 } |
|
56 |
|
57 /** Returns the cubic classification. |
|
58 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/core/SkTextBlob.cpp firefox-80.0.1/gfx/skia/skia/src/core/SkTextBlob.cpp |
|
59 --- firefox-80.0.1.orig/gfx/skia/skia/src/core/SkTextBlob.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
60 +++ firefox-80.0.1/gfx/skia/skia/src/core/SkTextBlob.cpp 2020-09-05 17:33:19.028493560 +0200 |
|
61 @@ -201,6 +201,7 @@ void SkTextBlob::operator delete(void* p |
|
62 |
|
63 void* SkTextBlob::operator new(size_t) { |
|
64 SK_ABORT("All blobs are created by placement new."); |
|
65 + SkUNREACHABLE; |
|
66 } |
|
67 |
|
68 void* SkTextBlob::operator new(size_t, void* p) { |
|
69 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/core/SkTypeface_remote.cpp firefox-80.0.1/gfx/skia/skia/src/core/SkTypeface_remote.cpp |
|
70 --- firefox-80.0.1.orig/gfx/skia/skia/src/core/SkTypeface_remote.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
71 +++ firefox-80.0.1/gfx/skia/skia/src/core/SkTypeface_remote.cpp 2020-09-05 17:33:09.424452127 +0200 |
|
72 @@ -29,6 +29,7 @@ void SkScalerContextProxy::initCache(SkS |
|
73 |
|
74 unsigned SkScalerContextProxy::generateGlyphCount() { |
|
75 SK_ABORT("Should never be called."); |
|
76 + SkUNREACHABLE; |
|
77 } |
|
78 |
|
79 bool SkScalerContextProxy::generateAdvance(SkGlyph* glyph) { |
|
80 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/core/SkTypeface_remote.h firefox-80.0.1/gfx/skia/skia/src/core/SkTypeface_remote.h |
|
81 --- firefox-80.0.1.orig/gfx/skia/skia/src/core/SkTypeface_remote.h 2020-08-31 16:04:09.000000000 +0200 |
|
82 +++ firefox-80.0.1/gfx/skia/skia/src/core/SkTypeface_remote.h 2020-09-05 17:34:55.424909478 +0200 |
|
83 @@ -63,23 +63,28 @@ public: |
|
84 bool isLogging() const {return fIsLogging;} |
|
85 |
|
86 protected: |
|
87 - int onGetUPEM() const override { SK_ABORT("Should never be called."); } |
|
88 + int onGetUPEM() const override { SK_ABORT("Should never be called."); SkUNREACHABLE; } |
|
89 std::unique_ptr<SkStreamAsset> onOpenStream(int* ttcIndex) const override { |
|
90 SK_ABORT("Should never be called."); |
|
91 + SkUNREACHABLE; |
|
92 } |
|
93 std::unique_ptr<SkFontData> onMakeFontData() const override { |
|
94 SK_ABORT("Should never be called."); |
|
95 + SkUNREACHABLE; |
|
96 } |
|
97 sk_sp<SkTypeface> onMakeClone(const SkFontArguments& args) const override { |
|
98 SK_ABORT("Should never be called."); |
|
99 + SkUNREACHABLE; |
|
100 } |
|
101 int onGetVariationDesignPosition(SkFontArguments::VariationPosition::Coordinate coordinates[], |
|
102 int coordinateCount) const override { |
|
103 SK_ABORT("Should never be called."); |
|
104 + SkUNREACHABLE; |
|
105 } |
|
106 int onGetVariationDesignParameters(SkFontParameters::Variation::Axis parameters[], |
|
107 int parameterCount) const override { |
|
108 SK_ABORT("Should never be called."); |
|
109 + SkUNREACHABLE; |
|
110 } |
|
111 void onGetFamilyName(SkString* familyName) const override { |
|
112 // Used by SkStrikeCache::DumpMemoryStatistics. |
|
113 @@ -87,12 +92,15 @@ protected: |
|
114 } |
|
115 SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override { |
|
116 SK_ABORT("Should never be called."); |
|
117 + SkUNREACHABLE; |
|
118 } |
|
119 int onGetTableTags(SkFontTableTag tags[]) const override { |
|
120 SK_ABORT("Should never be called."); |
|
121 + SkUNREACHABLE; |
|
122 } |
|
123 size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const override { |
|
124 SK_ABORT("Should never be called."); |
|
125 + SkUNREACHABLE; |
|
126 } |
|
127 SkScalerContext* onCreateScalerContext(const SkScalerContextEffects& effects, |
|
128 const SkDescriptor* desc) const override { |
|
129 @@ -116,6 +124,7 @@ protected: |
|
130 |
|
131 std::unique_ptr<SkAdvancedTypefaceMetrics> onGetAdvancedMetrics() const override { |
|
132 SK_ABORT("Should never be called."); |
|
133 + SkUNREACHABLE; |
|
134 } |
|
135 void onCharsToGlyphs(const SkUnichar* chars, int count, SkGlyphID glyphs[]) const override { |
|
136 SK_ABORT("Should never be called."); |
|
137 @@ -126,6 +135,7 @@ protected: |
|
138 |
|
139 void* onGetCTFontRef() const override { |
|
140 SK_ABORT("Should never be called."); |
|
141 + SkUNREACHABLE; |
|
142 } |
|
143 |
|
144 private: |
|
145 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp firefox-80.0.1/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp |
|
146 --- firefox-80.0.1.orig/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
147 +++ firefox-80.0.1/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp 2020-09-05 17:35:26.657044250 +0200 |
|
148 @@ -144,6 +144,7 @@ static GrTextureDomain::Mode to_texture_ |
|
149 return GrTextureDomain::kRepeat_Mode; |
|
150 default: |
|
151 SK_ABORT("Unsupported tile mode."); |
|
152 + SkUNREACHABLE; |
|
153 } |
|
154 } |
|
155 #endif |
|
156 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/effects/imagefilters/SkLightingImageFilter.cpp firefox-80.0.1/gfx/skia/skia/src/effects/imagefilters/SkLightingImageFilter.cpp |
|
157 --- firefox-80.0.1.orig/gfx/skia/skia/src/effects/imagefilters/SkLightingImageFilter.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
158 +++ firefox-80.0.1/gfx/skia/skia/src/effects/imagefilters/SkLightingImageFilter.cpp 2020-09-05 17:35:30.841062305 +0200 |
|
159 @@ -1701,6 +1701,7 @@ static SkImageFilterLight* create_random |
|
160 } |
|
161 default: |
|
162 SK_ABORT("Unexpected value."); |
|
163 + SkUNREACHABLE; |
|
164 } |
|
165 } |
|
166 |
|
167 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp firefox-80.0.1/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp |
|
168 --- firefox-80.0.1.orig/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
169 +++ firefox-80.0.1/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp 2020-09-05 17:35:41.193106978 +0200 |
|
170 @@ -69,6 +69,7 @@ void SkFontMgr_Indirect::onGetFamilyName |
|
171 |
|
172 SkFontStyleSet* SkFontMgr_Indirect::onCreateStyleSet(int index) const { |
|
173 SK_ABORT("Not implemented"); |
|
174 + SkUNREACHABLE; |
|
175 } |
|
176 |
|
177 SkFontStyleSet* SkFontMgr_Indirect::onMatchFamily(const char familyName[]) const { |
|
178 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrDataUtils.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/GrDataUtils.cpp |
|
179 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrDataUtils.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
180 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/GrDataUtils.cpp 2020-09-05 17:26:21.958694975 +0200 |
|
181 @@ -128,6 +128,7 @@ size_t GrCompressedDataSize(SkImage::Com |
|
182 return numBlocks * sizeof(ETC1Block); |
|
183 } |
|
184 SK_ABORT("Unexpected compression type"); |
|
185 + SkUNREACHABLE; |
|
186 } |
|
187 |
|
188 size_t GrCompressedRowBytes(SkImage::CompressionType type, int width) { |
|
189 @@ -137,6 +138,7 @@ size_t GrCompressedRowBytes(SkImage::Com |
|
190 return numBlocksWidth * sizeof(ETC1Block); |
|
191 } |
|
192 SK_ABORT("Unexpected compression type"); |
|
193 + SkUNREACHABLE; |
|
194 } |
|
195 |
|
196 // Fill in 'dest' with ETC1 blocks derived from 'colorf' |
|
197 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrFragmentProcessor.h firefox-80.0.1/gfx/skia/skia/src/gpu/GrFragmentProcessor.h |
|
198 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrFragmentProcessor.h 2020-08-31 16:04:09.000000000 +0200 |
|
199 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/GrFragmentProcessor.h 2020-09-05 17:26:07.414632282 +0200 |
|
200 @@ -375,6 +375,7 @@ protected: |
|
201 private: |
|
202 virtual SkPMColor4f constantOutputForConstantInput(const SkPMColor4f& /* inputColor */) const { |
|
203 SK_ABORT("Subclass must override this if advertising this optimization."); |
|
204 + SkUNREACHABLE; |
|
205 } |
|
206 |
|
207 /** Returns a new instance of the appropriate *GL* implementation class |
|
208 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrPathRendering.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/GrPathRendering.cpp |
|
209 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrPathRendering.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
210 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/GrPathRendering.cpp 2020-09-05 17:28:44.215308274 +0200 |
|
211 @@ -19,6 +19,7 @@ const GrUserStencilSettings& GrPathRende |
|
212 switch (fill) { |
|
213 default: |
|
214 SK_ABORT("Unexpected path fill."); |
|
215 + SkUNREACHABLE; |
|
216 case GrPathRendering::kWinding_FillType: { |
|
217 constexpr static GrUserStencilSettings kWindingStencilPass( |
|
218 GrUserStencilSettings::StaticInit< |
|
219 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrPathRendering.h firefox-80.0.1/gfx/skia/skia/src/gpu/GrPathRendering.h |
|
220 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrPathRendering.h 2020-08-31 16:04:09.000000000 +0200 |
|
221 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/GrPathRendering.h 2020-09-05 17:28:31.247252358 +0200 |
|
222 @@ -63,6 +63,7 @@ public: |
|
223 |
|
224 default: |
|
225 SK_ABORT("Unknown path transform type"); |
|
226 + SkUNREACHABLE; |
|
227 } |
|
228 } |
|
229 |
|
230 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp |
|
231 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
232 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp 2020-09-05 17:21:37.549469393 +0200 |
|
233 @@ -20,6 +20,7 @@ std::unique_ptr<GrFragmentProcessor> GrP |
|
234 return fp; |
|
235 #else |
|
236 SK_ABORT("Should not be called if !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS"); |
|
237 + SkUNREACHABLE; |
|
238 #endif |
|
239 } |
|
240 #endif |
|
241 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrReducedClip.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/GrReducedClip.cpp |
|
242 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrReducedClip.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
243 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/GrReducedClip.cpp 2020-09-05 17:28:39.151286438 +0200 |
|
244 @@ -525,6 +525,7 @@ GrReducedClip::ClipResult GrReducedClip: |
|
245 } |
|
246 |
|
247 SK_ABORT("Unexpected DeviceSpaceType"); |
|
248 + SkUNREACHABLE; |
|
249 } |
|
250 |
|
251 GrReducedClip::ClipResult GrReducedClip::clipOutsideElement(const Element* element) { |
|
252 @@ -591,6 +592,7 @@ GrReducedClip::ClipResult GrReducedClip: |
|
253 } |
|
254 |
|
255 SK_ABORT("Unexpected DeviceSpaceType"); |
|
256 + SkUNREACHABLE; |
|
257 } |
|
258 |
|
259 inline void GrReducedClip::addWindowRectangle(const SkRect& elementInteriorRect, bool elementIsAA) { |
|
260 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrResourceCache.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/GrResourceCache.cpp |
|
261 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrResourceCache.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
262 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/GrResourceCache.cpp 2020-09-05 17:24:04.038100548 +0200 |
|
263 @@ -40,6 +40,7 @@ GrScratchKey::ResourceType GrScratchKey: |
|
264 int32_t type = nextType++; |
|
265 if (type > SkTo<int32_t>(UINT16_MAX)) { |
|
266 SK_ABORT("Too many Resource Types"); |
|
267 + SkUNREACHABLE; |
|
268 } |
|
269 |
|
270 return static_cast<ResourceType>(type); |
|
271 @@ -51,6 +52,7 @@ GrUniqueKey::Domain GrUniqueKey::Generat |
|
272 int32_t domain = nextDomain++; |
|
273 if (domain > SkTo<int32_t>(UINT16_MAX)) { |
|
274 SK_ABORT("Too many GrUniqueKey Domains"); |
|
275 + SkUNREACHABLE; |
|
276 } |
|
277 |
|
278 return static_cast<Domain>(domain); |
|
279 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrShaderVar.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/GrShaderVar.cpp |
|
280 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/GrShaderVar.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
281 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/GrShaderVar.cpp 2020-09-05 17:21:29.397434277 +0200 |
|
282 @@ -18,6 +18,7 @@ static const char* type_modifier_string( |
|
283 case GrShaderVar::kUniform_TypeModifier: return "uniform"; |
|
284 } |
|
285 SK_ABORT("Unknown shader variable type modifier."); |
|
286 + SkUNREACHABLE; |
|
287 } |
|
288 |
|
289 void GrShaderVar::setIOType(GrIOType ioType) { |
|
290 @@ -32,6 +33,7 @@ void GrShaderVar::setIOType(GrIOType ioT |
|
291 return; |
|
292 } |
|
293 SK_ABORT("Unknown io type."); |
|
294 + SkUNREACHABLE; |
|
295 } |
|
296 |
|
297 void GrShaderVar::appendDecl(const GrShaderCaps* shaderCaps, SkString* out) const { |
|
298 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/SkGpuDevice.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/SkGpuDevice.cpp |
|
299 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/SkGpuDevice.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
300 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/SkGpuDevice.cpp 2020-09-05 17:30:38.891802801 +0200 |
|
301 @@ -283,6 +283,7 @@ static inline GrPrimitiveType point_mode |
|
302 return GrPrimitiveType::kLineStrip; |
|
303 } |
|
304 SK_ABORT("Unexpected mode"); |
|
305 + SkUNREACHABLE; |
|
306 } |
|
307 |
|
308 void SkGpuDevice::drawPoints(SkCanvas::PointMode mode, |
|
309 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/SkGr.h firefox-80.0.1/gfx/skia/skia/src/gpu/SkGr.h |
|
310 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/SkGr.h 2020-08-31 16:04:09.000000000 +0200 |
|
311 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/SkGr.h 2020-09-05 17:30:45.151829800 +0200 |
|
312 @@ -159,6 +159,7 @@ static inline GrPrimitiveType SkVertexMo |
|
313 break; |
|
314 } |
|
315 SK_ABORT("Invalid mode"); |
|
316 + SkUNREACHABLE; |
|
317 } |
|
318 |
|
319 ////////////////////////////////////////////////////////////////////////////// |
|
320 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrCCCoverageProcessor.h firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrCCCoverageProcessor.h |
|
321 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrCCCoverageProcessor.h 2020-08-31 16:04:09.000000000 +0200 |
|
322 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrCCCoverageProcessor.h 2020-09-05 17:32:06.476180575 +0200 |
|
323 @@ -240,6 +240,7 @@ inline const char* GrCCCoverageProcessor |
|
324 case PrimitiveType::kConics: return "kConics"; |
|
325 } |
|
326 SK_ABORT("Invalid PrimitiveType"); |
|
327 + SkUNREACHABLE; |
|
328 } |
|
329 |
|
330 inline void GrCCCoverageProcessor::TriPointInstance::set( |
|
331 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.cpp |
|
332 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
333 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.cpp 2020-09-05 17:32:10.548198140 +0200 |
|
334 @@ -60,6 +60,7 @@ static GrCCStrokeGeometry::Verb join_ver |
|
335 return Verb::kRoundJoin; |
|
336 } |
|
337 SK_ABORT("Invalid SkPaint::Join."); |
|
338 + SkUNREACHABLE; |
|
339 } |
|
340 |
|
341 void GrCCStrokeGeometry::beginPath(const SkStrokeRec& stroke, float strokeDevWidth, |
|
342 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.h firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.h |
|
343 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.h 2020-08-31 16:04:09.000000000 +0200 |
|
344 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrCCStrokeGeometry.h 2020-09-05 17:32:25.116260983 +0200 |
|
345 @@ -175,5 +175,6 @@ inline bool GrCCStrokeGeometry::IsIntern |
|
346 return false; |
|
347 } |
|
348 SK_ABORT("Invalid GrCCStrokeGeometry::Verb."); |
|
349 + SkUNREACHABLE; |
|
350 } |
|
351 #endif |
|
352 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp |
|
353 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
354 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp 2020-09-05 17:32:16.092222055 +0200 |
|
355 @@ -164,6 +164,7 @@ GrPathRenderer::CanDrawPath GrCoverageCo |
|
356 } |
|
357 |
|
358 SK_ABORT("Invalid stroke style."); |
|
359 + SkUNREACHABLE; |
|
360 } |
|
361 |
|
362 bool GrCoverageCountingPathRenderer::onDrawPath(const DrawPathArgs& args) { |
|
363 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrVSCoverageProcessor.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrVSCoverageProcessor.cpp |
|
364 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ccpr/GrVSCoverageProcessor.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
365 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/ccpr/GrVSCoverageProcessor.cpp 2020-09-05 17:32:20.524241174 +0200 |
|
366 @@ -550,4 +550,5 @@ GrGLSLPrimitiveProcessor* GrVSCoveragePr |
|
367 return new Impl(std::move(shader), 4); |
|
368 } |
|
369 SK_ABORT("Invalid PrimitiveType"); |
|
370 + SkUNREACHABLE; |
|
371 } |
|
372 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/dawn/GrDawnOpsRenderPass.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/dawn/GrDawnOpsRenderPass.cpp |
|
373 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/dawn/GrDawnOpsRenderPass.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
374 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/dawn/GrDawnOpsRenderPass.cpp 2020-09-05 17:29:04.783396962 +0200 |
|
375 @@ -39,7 +39,9 @@ static dawn::LoadOp to_dawn_load_op(GrLo |
|
376 return dawn::LoadOp::Clear; |
|
377 default: |
|
378 SK_ABORT("Invalid LoadOp"); |
|
379 + SkUNREACHABLE; |
|
380 } |
|
381 + SkUNREACHABLE; |
|
382 } |
|
383 |
|
384 GrDawnOpsRenderPass::GrDawnOpsRenderPass(GrDawnGpu* gpu, GrRenderTarget* rt, GrSurfaceOrigin origin, |
|
385 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/dawn/GrDawnUniformHandler.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/dawn/GrDawnUniformHandler.cpp |
|
386 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/dawn/GrDawnUniformHandler.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
387 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/dawn/GrDawnUniformHandler.cpp 2020-09-05 17:29:19.431460126 +0200 |
|
388 @@ -95,6 +95,7 @@ uint32_t grsltype_to_alignment_mask(GrSL |
|
389 break; |
|
390 } |
|
391 SK_ABORT("Unexpected type"); |
|
392 + SkUNREACHABLE; |
|
393 } |
|
394 |
|
395 static inline uint32_t grsltype_to_size(GrSLType type) { |
|
396 @@ -173,6 +174,7 @@ static inline uint32_t grsltype_to_size( |
|
397 break; |
|
398 } |
|
399 SK_ABORT("Unexpected type"); |
|
400 + SkUNREACHABLE; |
|
401 } |
|
402 |
|
403 uint32_t get_ubo_offset(uint32_t* currentOffset, |
|
404 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/dawn/GrDawnVaryingHandler.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/dawn/GrDawnVaryingHandler.cpp |
|
405 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/dawn/GrDawnVaryingHandler.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
406 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/dawn/GrDawnVaryingHandler.cpp 2020-09-05 17:29:23.527477789 +0200 |
|
407 @@ -76,6 +76,7 @@ static inline int grsltype_to_location_s |
|
408 return 0; |
|
409 } |
|
410 SK_ABORT("Unexpected type"); |
|
411 + SkUNREACHABLE; |
|
412 } |
|
413 |
|
414 static void finalize_helper(GrDawnVaryingHandler::VarArray& vars) { |
|
415 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.fp firefox-80.0.1/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.fp |
|
416 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.fp 2020-08-31 16:04:09.000000000 +0200 |
|
417 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.fp 2020-09-05 17:31:23.039993215 +0200 |
|
418 @@ -58,6 +58,7 @@ void main() { |
|
419 return color * input; |
|
420 } |
|
421 SK_ABORT("Unexpected mode"); |
|
422 + SkUNREACHABLE; |
|
423 } |
|
424 } |
|
425 |
|
426 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp |
|
427 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
428 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp 2020-09-05 17:31:42.796078430 +0200 |
|
429 @@ -204,6 +204,7 @@ const GrXPFactory* GrCoverageSetOpXPFact |
|
430 } |
|
431 #undef _CONSTEXPR_ |
|
432 SK_ABORT("Unknown region op."); |
|
433 + SkUNREACHABLE; |
|
434 } |
|
435 |
|
436 sk_sp<const GrXferProcessor> GrCoverageSetOpXPFactory::makeXferProcessor( |
|
437 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp |
|
438 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
439 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp 2020-09-05 17:31:32.900035745 +0200 |
|
440 @@ -753,6 +753,7 @@ const GrXPFactory* GrPorterDuffXPFactory |
|
441 return &gScreenPDXPF; |
|
442 default: |
|
443 SK_ABORT("Unexpected blend mode."); |
|
444 + SkUNREACHABLE; |
|
445 } |
|
446 } |
|
447 |
|
448 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/GrSkSLFP.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/effects/GrSkSLFP.cpp |
|
449 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/GrSkSLFP.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
450 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/effects/GrSkSLFP.cpp 2020-09-05 17:31:49.900109073 +0200 |
|
451 @@ -154,6 +154,7 @@ public: |
|
452 } |
|
453 printf("%s\n", SkSL::String(type.fName).c_str()); |
|
454 SK_ABORT("unsupported uniform type"); |
|
455 + SkUNREACHABLE; |
|
456 } |
|
457 |
|
458 void emitCode(EmitArgs& args) override { |
|
459 @@ -568,6 +569,7 @@ std::unique_ptr<GrFragmentProcessor> GrS |
|
460 } |
|
461 } |
|
462 SK_ABORT("unreachable"); |
|
463 + SkUNREACHABLE; |
|
464 } |
|
465 |
|
466 #endif |
|
467 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/generated/GrConstColorProcessor.h firefox-80.0.1/gfx/skia/skia/src/gpu/effects/generated/GrConstColorProcessor.h |
|
468 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/effects/generated/GrConstColorProcessor.h 2020-08-31 16:04:09.000000000 +0200 |
|
469 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/effects/generated/GrConstColorProcessor.h 2020-09-05 17:30:53.303864960 +0200 |
|
470 @@ -41,6 +41,7 @@ public: |
|
471 return color * input; |
|
472 } |
|
473 SK_ABORT("Unexpected mode"); |
|
474 + SkUNREACHABLE; |
|
475 } |
|
476 static std::unique_ptr<GrFragmentProcessor> Make(SkPMColor4f color, InputMode mode) { |
|
477 return std::unique_ptr<GrFragmentProcessor>(new GrConstColorProcessor(color, mode)); |
|
478 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/geometry/GrShape.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/geometry/GrShape.cpp |
|
479 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/geometry/GrShape.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
480 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/geometry/GrShape.cpp 2020-09-05 17:26:35.670754081 +0200 |
|
481 @@ -164,6 +164,7 @@ SkRect GrShape::bounds() const { |
|
482 return this->path().getBounds(); |
|
483 } |
|
484 SK_ABORT("Unknown shape type"); |
|
485 + SkUNREACHABLE; |
|
486 } |
|
487 |
|
488 SkRect GrShape::styledBounds() const { |
|
489 @@ -254,6 +255,7 @@ int GrShape::unstyledKeySize() const { |
|
490 } |
|
491 } |
|
492 SK_ABORT("Should never get here."); |
|
493 + SkUNREACHABLE; |
|
494 } |
|
495 |
|
496 void GrShape::writeUnstyledKey(uint32_t* key) const { |
|
497 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp |
|
498 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
499 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp 2020-09-05 17:23:12.109876788 +0200 |
|
500 @@ -4159,6 +4159,7 @@ GrBackendFormat GrGLCaps::getBackendForm |
|
501 return GrBackendFormat::MakeGL(GR_GL_COMPRESSED_ETC1_RGB8, GR_GL_TEXTURE_2D); |
|
502 } |
|
503 SK_ABORT("Invalid compression type"); |
|
504 + SkUNREACHABLE; |
|
505 } |
|
506 |
|
507 GrSwizzle GrGLCaps::getTextureSwizzle(const GrBackendFormat& format, GrColorType colorType) const { |
|
508 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLGLSL.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLGLSL.cpp |
|
509 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLGLSL.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
510 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLGLSL.cpp 2020-09-05 17:22:08.885604389 +0200 |
|
511 @@ -68,4 +68,5 @@ bool GrGLGetGLSLGeneration(const GrGLInt |
|
512 return true; |
|
513 } |
|
514 SK_ABORT("Unknown GL Standard"); |
|
515 + SkUNREACHABLE; |
|
516 } |
|
517 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLGpu.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLGpu.cpp |
|
518 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLGpu.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
519 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLGpu.cpp 2020-09-05 17:23:04.717844938 +0200 |
|
520 @@ -196,6 +196,7 @@ static int gl_target_to_binding_index(Gr |
|
521 return 2; |
|
522 } |
|
523 SK_ABORT("Unexpected GL texture target."); |
|
524 + SkUNREACHABLE; |
|
525 } |
|
526 |
|
527 GrGpuResource::UniqueID GrGLGpu::TextureUnitBindings::boundID(GrGLenum target) const { |
|
528 @@ -234,6 +235,7 @@ static GrGLenum filter_to_gl_mag_filter( |
|
529 case GrSamplerState::Filter::kMipMap: return GR_GL_LINEAR; |
|
530 } |
|
531 SK_ABORT("Unknown filter"); |
|
532 + SkUNREACHABLE; |
|
533 } |
|
534 |
|
535 static GrGLenum filter_to_gl_min_filter(GrSamplerState::Filter filter) { |
|
536 @@ -243,6 +245,7 @@ static GrGLenum filter_to_gl_min_filter( |
|
537 case GrSamplerState::Filter::kMipMap: return GR_GL_LINEAR_MIPMAP_LINEAR; |
|
538 } |
|
539 SK_ABORT("Unknown filter"); |
|
540 + SkUNREACHABLE; |
|
541 } |
|
542 |
|
543 static inline GrGLenum wrap_mode_to_gl_wrap(GrSamplerState::WrapMode wrapMode, |
|
544 @@ -257,6 +260,7 @@ static inline GrGLenum wrap_mode_to_gl_w |
|
545 return GR_GL_CLAMP_TO_BORDER; |
|
546 } |
|
547 SK_ABORT("Unknown wrap mode"); |
|
548 + SkUNREACHABLE; |
|
549 } |
|
550 |
|
551 /////////////////////////////////////////////////////////////////////////////// |
|
552 @@ -1107,7 +1111,7 @@ static bool renderbuffer_storage_msaa(co |
|
553 break; |
|
554 case GrGLCaps::kNone_MSFBOType: |
|
555 SK_ABORT("Shouldn't be here if we don't support multisampled renderbuffers."); |
|
556 - break; |
|
557 + SkUNREACHABLE; |
|
558 } |
|
559 return (GR_GL_NO_ERROR == CHECK_ALLOC_ERROR(ctx.interface())); |
|
560 } |
|
561 @@ -2275,9 +2279,10 @@ static GrGLenum gr_primitive_type_to_gl_ |
|
562 return GR_GL_LINE_STRIP; |
|
563 case GrPrimitiveType::kPath: |
|
564 SK_ABORT("non-mesh-based GrPrimitiveType"); |
|
565 - return 0; |
|
566 + SkUNREACHABLE; |
|
567 } |
|
568 SK_ABORT("invalid GrPrimitiveType"); |
|
569 + SkUNREACHABLE; |
|
570 } |
|
571 |
|
572 void GrGLGpu::sendMeshToGpu(GrPrimitiveType primitiveType, const GrBuffer* vertexBuffer, |
|
573 @@ -4006,7 +4011,8 @@ int GrGLGpu::TextureToCopyProgramIdx(GrT |
|
574 case kTextureExternalSampler_GrSLType: |
|
575 return 2; |
|
576 default: |
|
577 - SK_ABORT("Unexpected samper type"); |
|
578 + SK_ABORT("Unexpected sampler type"); |
|
579 + SkUNREACHABLE; |
|
580 } |
|
581 } |
|
582 |
|
583 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp |
|
584 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
585 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp 2020-09-05 17:23:22.477921462 +0200 |
|
586 @@ -197,6 +197,7 @@ static GrPathRendering::FillType convert |
|
587 switch (fill) { |
|
588 default: |
|
589 SK_ABORT("Incomplete Switch\n"); |
|
590 + SkUNREACHABLE; |
|
591 case SkPath::kWinding_FillType: |
|
592 case SkPath::kInverseWinding_FillType: |
|
593 return GrPathRendering::kWinding_FillType; |
|
594 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp |
|
595 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
596 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp 2020-09-05 17:22:32.685706927 +0200 |
|
597 @@ -25,6 +25,7 @@ GrTextureType GrGLTexture::TextureTypeFr |
|
598 return GrTextureType::kExternal; |
|
599 } |
|
600 SK_ABORT("Unexpected texture target"); |
|
601 + SkUNREACHABLE; |
|
602 } |
|
603 |
|
604 static inline GrGLenum target_from_texture_type(GrTextureType type) { |
|
605 @@ -37,8 +38,10 @@ static inline GrGLenum target_from_textu |
|
606 return GR_GL_TEXTURE_EXTERNAL; |
|
607 default: |
|
608 SK_ABORT("Unexpected texture target"); |
|
609 + SkUNREACHABLE; |
|
610 } |
|
611 SK_ABORT("Unexpected texture type"); |
|
612 + SkUNREACHABLE; |
|
613 } |
|
614 |
|
615 // Because this class is virtually derived from GrSurface we must explicitly call its constructor. |
|
616 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp |
|
617 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
618 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp 2020-09-05 17:23:27.989945214 +0200 |
|
619 @@ -80,6 +80,7 @@ static AttribLayout attrib_layout(GrVert |
|
620 return {true, 4, GR_GL_UNSIGNED_SHORT}; |
|
621 } |
|
622 SK_ABORT("Unknown vertex attrib type"); |
|
623 + SkUNREACHABLE; |
|
624 }; |
|
625 |
|
626 void GrGLAttribArrayState::set(GrGLGpu* gpu, |
|
627 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/glsl/GrGLSL.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/glsl/GrGLSL.cpp |
|
628 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/glsl/GrGLSL.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
629 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/glsl/GrGLSL.cpp 2020-09-05 17:30:03.215648939 +0200 |
|
630 @@ -98,4 +98,5 @@ const char* GrGLSLTypeString(GrSLType t) |
|
631 return "sampler"; |
|
632 } |
|
633 SK_ABORT("Unknown shader var type."); |
|
634 + SkUNREACHABLE; |
|
635 } |
|
636 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.cpp |
|
637 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
638 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.cpp 2020-09-05 17:30:16.439705971 +0200 |
|
639 @@ -35,6 +35,7 @@ static bool use_flat_interpolation(GrGLS |
|
640 return true; |
|
641 } |
|
642 SK_ABORT("Invalid interpolation"); |
|
643 + SkUNREACHABLE; |
|
644 } |
|
645 |
|
646 void GrGLSLVaryingHandler::addVarying(const char* name, GrGLSLVarying* varying, |
|
647 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp |
|
648 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
649 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp 2020-09-05 17:30:09.799677334 +0200 |
|
650 @@ -51,6 +51,7 @@ static const char* input_type_name(GrGLS |
|
651 case InputType::kTriangles: return "triangles"; |
|
652 } |
|
653 SK_ABORT("invalid input type"); |
|
654 + SkUNREACHABLE; |
|
655 } |
|
656 |
|
657 static const char* output_type_name(GrGLSLGeometryBuilder::OutputType out) { |
|
658 @@ -61,6 +62,7 @@ static const char* output_type_name(GrGL |
|
659 case OutputType::kTriangleStrip: return "triangle_strip"; |
|
660 } |
|
661 SK_ABORT("invalid output type"); |
|
662 + SkUNREACHABLE; |
|
663 } |
|
664 |
|
665 void GrGLSLGeometryBuilder::configure(InputType inputType, OutputType outputType, int maxVertices, |
|
666 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlCaps.mm firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlCaps.mm |
|
667 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlCaps.mm 2020-08-31 16:04:09.000000000 +0200 |
|
668 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlCaps.mm 2020-09-05 17:27:20.846948832 +0200 |
|
669 @@ -506,6 +506,7 @@ size_t GrMtlCaps::GetFormatIndex(MTLPixe |
|
670 } |
|
671 } |
|
672 SK_ABORT("Invalid MTLPixelFormat"); |
|
673 + SkUNREACHABLE; |
|
674 } |
|
675 |
|
676 void GrMtlCaps::initFormatTable() { |
|
677 @@ -1011,6 +1012,7 @@ GrBackendFormat GrMtlCaps::getBackendFor |
|
678 #endif |
|
679 } |
|
680 SK_ABORT("Invalid compression type"); |
|
681 + SkUNREACHABLE; |
|
682 } |
|
683 |
|
684 GrSwizzle GrMtlCaps::getTextureSwizzle(const GrBackendFormat& format, GrColorType colorType) const { |
|
685 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.mm firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.mm |
|
686 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.mm 2020-08-31 16:04:09.000000000 +0200 |
|
687 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.mm 2020-09-05 17:26:49.110812019 +0200 |
|
688 @@ -155,6 +155,7 @@ static inline MTLVertexFormat attribute_ |
|
689 return MTLVertexFormatUShort4Normalized; |
|
690 } |
|
691 SK_ABORT("Unknown vertex attribute type"); |
|
692 + SkUNREACHABLE; |
|
693 } |
|
694 |
|
695 static MTLVertexDescriptor* create_vertex_descriptor(const GrPrimitiveProcessor& primProc) { |
|
696 @@ -276,6 +277,7 @@ static MTLBlendFactor blend_coeff_to_mtl |
|
697 } |
|
698 |
|
699 SK_ABORT("Unknown blend coefficient"); |
|
700 + SkUNREACHABLE; |
|
701 } |
|
702 |
|
703 static MTLBlendOperation blend_equation_to_mtl_blend_op(GrBlendEquation equation) { |
|
704 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlSampler.mm firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlSampler.mm |
|
705 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlSampler.mm 2020-08-31 16:04:09.000000000 +0200 |
|
706 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlSampler.mm 2020-09-05 17:26:53.606831401 +0200 |
|
707 @@ -38,6 +38,7 @@ static inline MTLSamplerAddressMode wrap |
|
708 } |
|
709 } |
|
710 SK_ABORT("Unknown wrap mode."); |
|
711 + SkUNREACHABLE; |
|
712 } |
|
713 |
|
714 GrMtlSampler* GrMtlSampler::Create(const GrMtlGpu* gpu, const GrSamplerState& samplerState) { |
|
715 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlUniformHandler.mm firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlUniformHandler.mm |
|
716 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlUniformHandler.mm 2020-08-31 16:04:09.000000000 +0200 |
|
717 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlUniformHandler.mm 2020-09-05 17:27:08.118893961 +0200 |
|
718 @@ -90,6 +90,7 @@ static uint32_t grsltype_to_alignment_ma |
|
719 break; |
|
720 } |
|
721 SK_ABORT("Unexpected type"); |
|
722 + SkUNREACHABLE; |
|
723 } |
|
724 |
|
725 /** Returns the size in bytes taken up in Metal buffers for GrSLTypes. */ |
|
726 @@ -172,6 +173,7 @@ static inline uint32_t grsltype_to_mtl_s |
|
727 break; |
|
728 } |
|
729 SK_ABORT("Unexpected type"); |
|
730 + SkUNREACHABLE; |
|
731 } |
|
732 |
|
733 // Given the current offset into the ubo, calculate the offset for the uniform we're trying to add |
|
734 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlUtil.mm firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlUtil.mm |
|
735 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/mtl/GrMtlUtil.mm 2020-08-31 16:04:09.000000000 +0200 |
|
736 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/mtl/GrMtlUtil.mm 2020-09-05 17:27:01.606865888 +0200 |
|
737 @@ -112,6 +112,7 @@ bool GrPixelConfigToMTLFormat(GrPixelCon |
|
738 return true; |
|
739 } |
|
740 SK_ABORT("Unexpected config"); |
|
741 + SkUNREACHABLE; |
|
742 } |
|
743 |
|
744 MTLTextureDescriptor* GrGetMTLTextureDescriptor(id<MTLTexture> mtlTexture) { |
|
745 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ops/GrDrawVerticesOp.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/ops/GrDrawVerticesOp.cpp |
|
746 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ops/GrDrawVerticesOp.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
747 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/ops/GrDrawVerticesOp.cpp 2020-09-05 17:27:56.087100762 +0200 |
|
748 @@ -610,6 +610,7 @@ static uint32_t seed_vertices(GrPrimitiv |
|
749 return 0; |
|
750 } |
|
751 SK_ABORT("Incomplete switch\n"); |
|
752 + SkUNREACHABLE; |
|
753 } |
|
754 |
|
755 static uint32_t primitive_vertices(GrPrimitiveType type) { |
|
756 @@ -627,6 +628,7 @@ static uint32_t primitive_vertices(GrPri |
|
757 return 0; |
|
758 } |
|
759 SK_ABORT("Incomplete switch\n"); |
|
760 + SkUNREACHABLE; |
|
761 } |
|
762 |
|
763 static SkPoint random_point(SkRandom* random, SkScalar min, SkScalar max) { |
|
764 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ops/GrFillRRectOp.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/ops/GrFillRRectOp.cpp |
|
765 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ops/GrFillRRectOp.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
766 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/ops/GrFillRRectOp.cpp 2020-09-05 17:27:40.111031883 +0200 |
|
767 @@ -823,4 +823,5 @@ static bool can_use_hw_derivatives_with_ |
|
768 } |
|
769 } |
|
770 SK_ABORT("Invalid round rect type."); |
|
771 + SkUNREACHABLE; |
|
772 } |
|
773 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ops/GrOvalOpFactory.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/ops/GrOvalOpFactory.cpp |
|
774 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ops/GrOvalOpFactory.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
775 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/ops/GrOvalOpFactory.cpp 2020-09-05 17:28:03.935134598 +0200 |
|
776 @@ -2283,6 +2283,7 @@ static int rrect_type_to_vert_count(RRec |
|
777 return kVertsPerOverstrokeRRect; |
|
778 } |
|
779 SK_ABORT("Invalid type"); |
|
780 + SkUNREACHABLE; |
|
781 } |
|
782 |
|
783 static int rrect_type_to_index_count(RRectType type) { |
|
784 @@ -2295,6 +2296,7 @@ static int rrect_type_to_index_count(RRe |
|
785 return kIndicesPerOverstrokeRRect; |
|
786 } |
|
787 SK_ABORT("Invalid type"); |
|
788 + SkUNREACHABLE; |
|
789 } |
|
790 |
|
791 static const uint16_t* rrect_type_to_indices(RRectType type) { |
|
792 @@ -2306,6 +2308,7 @@ static const uint16_t* rrect_type_to_ind |
|
793 return gOverstrokeRRectIndices; |
|
794 } |
|
795 SK_ABORT("Invalid type"); |
|
796 + SkUNREACHABLE; |
|
797 } |
|
798 |
|
799 /////////////////////////////////////////////////////////////////////////////////////////////////// |
|
800 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ops/GrShadowRRectOp.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/ops/GrShadowRRectOp.cpp |
|
801 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/ops/GrShadowRRectOp.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
802 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/ops/GrShadowRRectOp.cpp 2020-09-05 17:27:49.879073997 +0200 |
|
803 @@ -155,6 +155,7 @@ static int rrect_type_to_vert_count(RRec |
|
804 return kVertsPerOverstrokeRRect; |
|
805 } |
|
806 SK_ABORT("Invalid type"); |
|
807 + SkUNREACHABLE; |
|
808 } |
|
809 |
|
810 static int rrect_type_to_index_count(RRectType type) { |
|
811 @@ -167,6 +168,7 @@ static int rrect_type_to_index_count(RRe |
|
812 return kIndicesPerOverstrokeRRect; |
|
813 } |
|
814 SK_ABORT("Invalid type"); |
|
815 + SkUNREACHABLE; |
|
816 } |
|
817 |
|
818 static const uint16_t* rrect_type_to_indices(RRectType type) { |
|
819 @@ -178,6 +180,7 @@ static const uint16_t* rrect_type_to_ind |
|
820 return gRRectIndices; |
|
821 } |
|
822 SK_ABORT("Invalid type"); |
|
823 + SkUNREACHABLE; |
|
824 } |
|
825 |
|
826 /////////////////////////////////////////////////////////////////////////////// |
|
827 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/text/GrTextBlob.h firefox-80.0.1/gfx/skia/skia/src/gpu/text/GrTextBlob.h |
|
828 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/text/GrTextBlob.h 2020-08-31 16:04:09.000000000 +0200 |
|
829 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/text/GrTextBlob.h 2020-09-05 17:30:30.791767867 +0200 |
|
830 @@ -125,6 +125,7 @@ public: |
|
831 |
|
832 void* operator new(size_t) { |
|
833 SK_ABORT("All blobs are created by placement new."); |
|
834 + SkUNREACHABLE; |
|
835 } |
|
836 |
|
837 void* operator new(size_t, void* p) { return p; } |
|
838 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/text/GrTextBlobVertexRegenerator.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/text/GrTextBlobVertexRegenerator.cpp |
|
839 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/text/GrTextBlobVertexRegenerator.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
840 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/text/GrTextBlobVertexRegenerator.cpp 2020-09-05 17:30:25.919746855 +0200 |
|
841 @@ -284,4 +284,5 @@ bool GrTextBlob::VertexRegenerator::rege |
|
842 return true; |
|
843 } |
|
844 SK_ABORT("Should not get here"); |
|
845 + SkUNREACHABLE; |
|
846 } |
|
847 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkCaps.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkCaps.cpp |
|
848 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkCaps.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
849 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkCaps.cpp 2020-09-05 17:25:38.166506214 +0200 |
|
850 @@ -108,6 +108,7 @@ static FormatCompatibilityClass format_c |
|
851 |
|
852 default: |
|
853 SK_ABORT("Unsupported VkFormat"); |
|
854 + SkUNREACHABLE; |
|
855 } |
|
856 } |
|
857 |
|
858 @@ -1656,6 +1657,7 @@ GrBackendFormat GrVkCaps::getBackendForm |
|
859 return GrBackendFormat::MakeVk(VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK); |
|
860 } |
|
861 SK_ABORT("Invalid compression type"); |
|
862 + SkUNREACHABLE; |
|
863 } |
|
864 |
|
865 GrSwizzle GrVkCaps::getTextureSwizzle(const GrBackendFormat& format, GrColorType colorType) const { |
|
866 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkMemory.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkMemory.cpp |
|
867 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkMemory.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
868 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkMemory.cpp 2020-09-05 17:25:19.878427391 +0200 |
|
869 @@ -28,6 +28,7 @@ static BufferUsage get_buffer_usage(GrVk |
|
870 return BufferUsage::kCpuOnly; |
|
871 } |
|
872 SK_ABORT("Invalid GrVkBuffer::Type"); |
|
873 + SkUNREACHABLE; |
|
874 } |
|
875 |
|
876 bool GrVkMemory::AllocAndBindBufferMemory(const GrVkGpu* gpu, |
|
877 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkPipeline.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkPipeline.cpp |
|
878 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkPipeline.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
879 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkPipeline.cpp 2020-09-05 17:25:48.238549627 +0200 |
|
880 @@ -80,6 +80,7 @@ static inline VkFormat attrib_type_to_vk |
|
881 return VK_FORMAT_R16G16B16A16_UNORM; |
|
882 } |
|
883 SK_ABORT("Unknown vertex attrib type"); |
|
884 + SkUNREACHABLE; |
|
885 } |
|
886 |
|
887 static void setup_vertex_input_state(const GrPrimitiveProcessor& primProc, |
|
888 @@ -162,8 +163,10 @@ static VkPrimitiveTopology gr_primitive_ |
|
889 return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP; |
|
890 case GrPrimitiveType::kPath: |
|
891 SK_ABORT("Unsupported primitive type"); |
|
892 + SkUNREACHABLE; |
|
893 } |
|
894 SK_ABORT("invalid GrPrimitiveType"); |
|
895 + SkUNREACHABLE; |
|
896 } |
|
897 |
|
898 static void setup_input_assembly_state(GrPrimitiveType primitiveType, |
|
899 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkSampler.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkSampler.cpp |
|
900 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkSampler.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
901 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkSampler.cpp 2020-09-05 17:25:24.502447321 +0200 |
|
902 @@ -23,6 +23,7 @@ static inline VkSamplerAddressMode wrap_ |
|
903 return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER; |
|
904 } |
|
905 SK_ABORT("Unknown wrap mode."); |
|
906 + SkUNREACHABLE; |
|
907 } |
|
908 |
|
909 GrVkSampler* GrVkSampler::Create(GrVkGpu* gpu, const GrSamplerState& samplerState, |
|
910 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkTransferBuffer.h firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkTransferBuffer.h |
|
911 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkTransferBuffer.h 2020-08-31 16:04:09.000000000 +0200 |
|
912 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkTransferBuffer.h 2020-09-05 17:25:55.190579592 +0200 |
|
913 @@ -34,6 +34,7 @@ private: |
|
914 |
|
915 bool onUpdateData(const void* src, size_t srcSizeInBytes) override { |
|
916 SK_ABORT("Not implemented for transfer buffers."); |
|
917 + SkUNREACHABLE; |
|
918 } |
|
919 |
|
920 GrVkGpu* getVkGpu() const { |
|
921 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkUniformHandler.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkUniformHandler.cpp |
|
922 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkUniformHandler.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
923 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkUniformHandler.cpp 2020-09-05 17:25:14.854405738 +0200 |
|
924 @@ -89,6 +89,7 @@ static uint32_t grsltype_to_alignment_ma |
|
925 break; |
|
926 } |
|
927 SK_ABORT("Unexpected type"); |
|
928 + SkUNREACHABLE; |
|
929 } |
|
930 |
|
931 /** Returns the size in bytes taken up in vulkanbuffers for GrSLTypes. */ |
|
932 @@ -172,6 +173,7 @@ static inline uint32_t grsltype_to_vk_si |
|
933 break; |
|
934 } |
|
935 SK_ABORT("Unexpected type"); |
|
936 + SkUNREACHABLE; |
|
937 } |
|
938 |
|
939 |
|
940 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkVaryingHandler.cpp firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkVaryingHandler.cpp |
|
941 --- firefox-80.0.1.orig/gfx/skia/skia/src/gpu/vk/GrVkVaryingHandler.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
942 +++ firefox-80.0.1/gfx/skia/skia/src/gpu/vk/GrVkVaryingHandler.cpp 2020-09-05 17:25:28.502464561 +0200 |
|
943 @@ -74,6 +74,7 @@ static inline int grsltype_to_location_s |
|
944 return 1; |
|
945 } |
|
946 SK_ABORT("Unexpected type"); |
|
947 + SkUNREACHABLE; |
|
948 } |
|
949 |
|
950 static void finalize_helper(GrVkVaryingHandler::VarArray& vars) { |
|
951 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/pdf/SkPDFTag.cpp firefox-80.0.1/gfx/skia/skia/src/pdf/SkPDFTag.cpp |
|
952 --- firefox-80.0.1.orig/gfx/skia/skia/src/pdf/SkPDFTag.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
953 +++ firefox-80.0.1/gfx/skia/skia/src/pdf/SkPDFTag.cpp 2020-09-05 17:35:12.352982524 +0200 |
|
954 @@ -64,6 +64,7 @@ static const char* tag_name_from_type(Sk |
|
955 #undef M |
|
956 } |
|
957 SK_ABORT("bad tag"); |
|
958 + SkUNREACHABLE; |
|
959 } |
|
960 |
|
961 struct SkPDFTagNode { |
|
962 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp firefox-80.0.1/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp |
|
963 --- firefox-80.0.1.orig/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
964 +++ firefox-80.0.1/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp 2020-09-05 17:21:09.173347158 +0200 |
|
965 @@ -173,18 +173,22 @@ public: |
|
966 protected: |
|
967 int onCountFamilies() const override { |
|
968 SK_ABORT("Not implemented."); |
|
969 + SkUNREACHABLE; |
|
970 } |
|
971 |
|
972 void onGetFamilyName(int index, SkString* familyName) const override { |
|
973 SK_ABORT("Not implemented."); |
|
974 + SkUNREACHABLE; |
|
975 } |
|
976 |
|
977 SkFontStyleSet* onCreateStyleSet(int index) const override { |
|
978 SK_ABORT("Not implemented."); |
|
979 + SkUNREACHABLE; |
|
980 } |
|
981 |
|
982 SkFontStyleSet* onMatchFamily(const char familyName[]) const override { |
|
983 SK_ABORT("Not implemented."); |
|
984 + SkUNREACHABLE; |
|
985 } |
|
986 |
|
987 SkTypeface* onMatchFamilyStyle(const char requestedFamilyName[], |
|
988 @@ -215,10 +219,12 @@ protected: |
|
989 const char* bcp47[], int bcp47Count, |
|
990 SkUnichar character) const override { |
|
991 SK_ABORT("Not implemented."); |
|
992 + SkUNREACHABLE; |
|
993 } |
|
994 |
|
995 SkTypeface* onMatchFaceStyle(const SkTypeface*, const SkFontStyle&) const override { |
|
996 SK_ABORT("Not implemented."); |
|
997 + SkUNREACHABLE; |
|
998 } |
|
999 |
|
1000 sk_sp<SkTypeface> onMakeFromData(sk_sp<SkData> data, int ttcIndex) const override { |
|
1001 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/shaders/SkImageShader.cpp firefox-80.0.1/gfx/skia/skia/src/shaders/SkImageShader.cpp |
|
1002 --- firefox-80.0.1.orig/gfx/skia/skia/src/shaders/SkImageShader.cpp 2020-08-31 16:04:09.000000000 +0200 |
|
1003 +++ firefox-80.0.1/gfx/skia/skia/src/shaders/SkImageShader.cpp 2020-09-05 17:21:18.005385203 +0200 |
|
1004 @@ -183,6 +183,7 @@ static GrSamplerState::WrapMode tile_mod |
|
1005 return GrSamplerState::WrapMode::kClampToBorder; |
|
1006 } |
|
1007 SK_ABORT("Unknown tile mode."); |
|
1008 + SkUNREACHABLE; |
|
1009 } |
|
1010 |
|
1011 std::unique_ptr<GrFragmentProcessor> SkImageShader::asFragmentProcessor( |
|
1012 diff -rup firefox-80.0.1.orig/gfx/skia/skia/src/utils/SkShadowUtils.cpp firefox-80.0.1/gfx/skia/skia/src/utils/SkShadowUtils.cpp |
|
1013 --- firefox-80.0.1.orig/gfx/skia/skia/src/utils/SkShadowUtils.cpp 2020-09-05 13:23:03.590763363 +0200 |
|
1014 +++ firefox-80.0.1/gfx/skia/skia/src/utils/SkShadowUtils.cpp 2020-09-05 17:32:47.792358805 +0200 |
|
1015 @@ -149,6 +149,7 @@ struct SpotVerticesFactory { |
|
1016 return false; |
|
1017 } |
|
1018 SK_ABORT("Uninitialized occluder type?"); |
|
1019 + SkUNREACHABLE; |
|
1020 } |
|
1021 |
|
1022 sk_sp<SkVertices> makeVertices(const SkPath& path, const SkMatrix& ctm, |