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

Unified Diff: dm/DM.cpp

Issue 1365313002: Merge SkCodec with SkScanlineDecoder (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Skip ICO in SkScaledCodec for now Created 5 years, 3 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 | « bench/subset/SubsetZoomBench.cpp ('k') | dm/DMSrcSink.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dm/DM.cpp
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 11581fda81fc71e7d30a2aa9a226fe2b45b3385a..0faca8f7c3e1f1250cbf4971910cf0d37faa890f 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -311,6 +311,12 @@ static void push_codec_srcs(Path path) {
}
}
+ if (path.endsWith(".ico") || path.endsWith(".ICO")) {
+ // FIXME: skbug.com/4404: ICO does not have the ability to decode scanlines, so we cannot
+ // use SkScaledCodec with it.
+ return;
+ }
+
// SkScaledCodec Scales
// The native scales are included to make sure that SkScaledCodec defaults to the native
// scaling strategy when possible.
« no previous file with comments | « bench/subset/SubsetZoomBench.cpp ('k') | dm/DMSrcSink.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698