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

Side by Side Diff: src/images/SkImageDecoder_FactoryDefault.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 #include "SkImageDecoder.h" 9 #include "SkImageDecoder.h"
10 #include "SkMovie.h" 10 #include "SkMovie.h"
11 #include "SkStream.h" 11 #include "SkStream.h"
12 #include "SkTRegistry.h" 12 #include "SkTRegistry.h"
13 13
14 extern SkImageDecoder* image_decoder_from_stream(SkStream*); 14 extern SkImageDecoder* image_decoder_from_stream(SkStream*);
15 15
16 SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) { 16 SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
17 return image_decoder_from_stream(stream); 17 return image_decoder_from_stream(stream);
18 } 18 }
19 19
20 ///////////////////////////////////////////////////////////////////////// 20 /////////////////////////////////////////////////////////////////////////
21 21
22 typedef SkTRegistry<SkMovie*, SkStream*> MovieReg; 22 typedef SkTRegistry<SkMovie*(*)(SkStream*)> MovieReg;
23 23
24 SkMovie* SkMovie::DecodeStream(SkStream* stream) { 24 SkMovie* SkMovie::DecodeStream(SkStream* stream) {
25 const MovieReg* curr = MovieReg::Head(); 25 const MovieReg* curr = MovieReg::Head();
26 while (curr) { 26 while (curr) {
27 SkMovie* movie = curr->factory()(stream); 27 SkMovie* movie = curr->data()(stream);
28 if (movie) { 28 if (movie) {
29 return movie; 29 return movie;
30 } 30 }
31 // we must rewind only if we got NULL, since we gave the stream to the 31 // we must rewind only if we got NULL, since we gave the stream to the
32 // movie, who may have already started reading from it 32 // movie, who may have already started reading from it
33 stream->rewind(); 33 stream->rewind();
34 curr = curr->next(); 34 curr = curr->next();
35 } 35 }
36 return NULL; 36 return NULL;
37 } 37 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698