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

Unified Diff: src/device/xps/SkXPSDevice.cpp

Issue 1539553002: Add default ctor to SkMask (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Add warning for ignored return values Created 5 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkRasterizer.cpp ('k') | src/effects/SkBlurMask.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/device/xps/SkXPSDevice.cpp
diff --git a/src/device/xps/SkXPSDevice.cpp b/src/device/xps/SkXPSDevice.cpp
index 86c729c9e405cd516f062e69ac87da01e442ccc9..48233bb55437a37a90fba0c6726a2baf9bc94e2e 100644
--- a/src/device/xps/SkXPSDevice.cpp
+++ b/src/device/xps/SkXPSDevice.cpp
@@ -1628,12 +1628,8 @@ void SkXPSDevice::drawPath(const SkDraw& d,
//[Mask -> Mask]
SkMask filteredMask;
- if (filter &&
- filter->filterMask(&filteredMask, *mask, *d.fMatrix, nullptr)) {
-
+ if (filter && filter->filterMask(&filteredMask, *mask, *d.fMatrix, nullptr)) {
mask = &filteredMask;
- } else {
- filteredMask.fImage = nullptr;
}
SkAutoMaskFreeImage filteredAmi(filteredMask.fImage);
@@ -1675,13 +1671,8 @@ void SkXPSDevice::drawPath(const SkDraw& d,
//[Mask -> Mask]
SkMask filteredMask;
- if (filter->filterMask(&filteredMask,
- rasteredMask,
- matrix,
- nullptr)) {
+ if (filter->filterMask(&filteredMask, rasteredMask, matrix, nullptr)) {
mask = &filteredMask;
- } else {
- filteredMask.fImage = nullptr;
}
SkAutoMaskFreeImage filteredAmi(filteredMask.fImage);
« no previous file with comments | « src/core/SkRasterizer.cpp ('k') | src/effects/SkBlurMask.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698