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

Unified Diff: dm/DMSrcSink.cpp

Issue 1824983003: SkRecord: infer return type for visit() and mutate(). (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 9 months 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 | « no previous file | src/core/SkBigPicture.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dm/DMSrcSink.cpp
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 3f4667931bdbe503e8c05e771c995fe4ea4b6d89..6fd46c80ed99a3b299ad139b0b6bfe5192a5e0fa 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -842,15 +842,15 @@ Error ImageGenSrc::draw(SkCanvas* canvas) const {
canvas->drawImage(image, 0, 0);
return "";
}
-
+
// Test various color and alpha types on CPU
SkImageInfo decodeInfo = gen->getInfo().makeAlphaType(fDstAlphaType);
-
+
if (kGray_8_SkColorType == decodeInfo.colorType() &&
kOpaque_SkAlphaType != decodeInfo.alphaType()) {
return Error::Nonfatal("Avoid requesting non-opaque kGray8 decodes.");
}
-
+
SkAutoTUnref<SkColorTable> colorTable(nullptr);
SkPMColor* colorPtr = nullptr;
int* colorCountPtr = nullptr;
@@ -867,7 +867,7 @@ Error ImageGenSrc::draw(SkCanvas* canvas) const {
return SkStringPrintf("Image(%s) is too large (%d x %d)", fPath.c_str(),
decodeInfo.width(), decodeInfo.height());
}
-
+
if (!gen->getPixels(decodeInfo, bitmap.getPixels(), bitmap.rowBytes(), colorPtr,
colorCountPtr))
{
@@ -1508,7 +1508,7 @@ Error ViaSingletonPictures::draw(
drawables ? *drawables : empty,
};
for (int i = 0; i < skr.count(); i++) {
- skr.visit<void>(i, drawsAsSingletonPictures);
+ skr.visit(i, drawsAsSingletonPictures);
}
sk_sp<SkPicture> macroPic(macroRec.finishRecordingAsPicture());
« no previous file with comments | « no previous file | src/core/SkBigPicture.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698