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

Unified Diff: src/images/SkImageEncoder_Factory.cpp

Issue 23453031: Rewrite SkTRegistry to take any trivially-copyable type. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 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
Index: src/images/SkImageEncoder_Factory.cpp
diff --git a/src/images/SkImageEncoder_Factory.cpp b/src/images/SkImageEncoder_Factory.cpp
index 10f8d64decffaa6bad6af71bd6d6fa4ba697e162..844013c48ed0708f3c0c6c3dc27198aa7a7a4f3b 100644
--- a/src/images/SkImageEncoder_Factory.cpp
+++ b/src/images/SkImageEncoder_Factory.cpp
@@ -10,16 +10,16 @@
#include "SkImageEncoder.h"
#include "SkTRegistry.h"
-typedef SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> EncodeReg;
+typedef SkTRegistry<SkImageEncoder*(*)(SkImageEncoder::Type)> EncodeReg;
// Can't use the typedef here because of complex C++ corner cases
-template EncodeReg* SkTRegistry<SkImageEncoder*, SkImageEncoder::Type>::gHead;
+template EncodeReg* SkTRegistry<SkImageEncoder*(*)(SkImageEncoder::Type)>::gHead;
SkImageEncoder* SkImageEncoder::Create(Type t) {
SkImageEncoder* codec = NULL;
const EncodeReg* curr = EncodeReg::Head();
while (curr) {
- if ((codec = curr->factory()(t)) != NULL) {
+ if ((codec = curr->data()(t)) != NULL) {
return codec;
}
curr = curr->next();

Powered by Google App Engine
This is Rietveld 408576698