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

Unified Diff: src/images/SkForceLinking.cpp

Issue 1820503002: Delete SkImageDecoder (Closed) Base URL: https://skia.googlesource.com/skia.git@fix-animator
Patch Set: Include SkImage 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 | « src/gpu/GrLayerCache.h ('k') | src/images/SkImageDecoder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/images/SkForceLinking.cpp
diff --git a/src/images/SkForceLinking.cpp b/src/images/SkForceLinking.cpp
index 55b7021432b7367f9327ba1d61df60a4ad1d8ef5..05fc7e08a6d3a962a761a201e4469d94bea94c4e 100644
--- a/src/images/SkForceLinking.cpp
+++ b/src/images/SkForceLinking.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
+#include "SkImageEncoder.h"
#include "SkForceLinking.h"
-#include "SkImageDecoder.h"
// This method is required to fool the linker into not discarding the pre-main
// initialization and registration of the decoder classes. Passing true will
@@ -14,26 +14,22 @@
int SkForceLinking(bool doNotPassTrue) {
if (doNotPassTrue) {
SkASSERT(false);
- CreateJPEGImageDecoder();
- CreateWEBPImageDecoder();
- CreateBMPImageDecoder();
- CreateICOImageDecoder();
- CreateWBMPImageDecoder();
+ CreateJPEGImageEncoder();
+ CreateWEBPImageEncoder();
+
// Only link hardware texture codecs on platforms that build them. See images.gyp
#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
- CreatePKMImageDecoder();
- CreateKTXImageDecoder();
- CreateASTCImageDecoder();
+ CreateKTXImageEncoder();
#endif
- // Only link GIF and PNG on platforms that build them. See images.gyp
+
#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_IOS)
- CreateGIFImageDecoder();
+ CreatePNGImageEncoder();
#endif
-#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_IOS)
- CreatePNGImageDecoder();
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
+ CreatePNGImageEncoder_CG();
#endif
-#if defined(SK_BUILD_FOR_IOS)
- CreatePNGImageEncoder_IOS();
+#if defined(SK_BUILD_FOR_WIN)
+ CreateImageEncoder_WIC();
#endif
return -1;
}
« no previous file with comments | « src/gpu/GrLayerCache.h ('k') | src/images/SkImageDecoder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698