Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(223)

Side by Side Diff: dm/DMSrcSink.h

Issue 2482123003: Fix DM race in SVGSrc (Closed)
Patch Set: parse error message tweak Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | dm/DMSrcSink.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef DMSrcSink_DEFINED 8 #ifndef DMSrcSink_DEFINED
9 #define DMSrcSink_DEFINED 9 #define DMSrcSink_DEFINED
10 10
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 class SVGSrc : public Src { 254 class SVGSrc : public Src {
255 public: 255 public:
256 explicit SVGSrc(Path path); 256 explicit SVGSrc(Path path);
257 257
258 Error draw(SkCanvas*) const override; 258 Error draw(SkCanvas*) const override;
259 SkISize size() const override; 259 SkISize size() const override;
260 Name name() const override; 260 Name name() const override;
261 bool veto(SinkFlags) const override; 261 bool veto(SinkFlags) const override;
262 262
263 private: 263 private:
264 Error ensureDom() const; 264 Name fName;
265 265 sk_sp<SkSVGDOM> fDom;
266 Path fPath; 266 SkScalar fScale;
267 mutable sk_sp<SkSVGDOM> fDom;
268 mutable SkScalar fScale;
269 267
270 typedef Src INHERITED; 268 typedef Src INHERITED;
271 }; 269 };
272 #endif // SK_XML 270 #endif // SK_XML
273 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~*/ 271 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~*/
274 272
275 class MSKPSrc : public Src { 273 class MSKPSrc : public Src {
276 public: 274 public:
277 explicit MSKPSrc(Path path); 275 explicit MSKPSrc(Path path);
278 276
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 475
478 class ViaLite : public Via { 476 class ViaLite : public Via {
479 public: 477 public:
480 explicit ViaLite(Sink* sink) : Via(sink) {} 478 explicit ViaLite(Sink* sink) : Via(sink) {}
481 Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override; 479 Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
482 }; 480 };
483 481
484 } // namespace DM 482 } // namespace DM
485 483
486 #endif//DMSrcSink_DEFINED 484 #endif//DMSrcSink_DEFINED
OLDNEW
« no previous file with comments | « no previous file | dm/DMSrcSink.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698