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

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: reed+scroggo 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
« no previous file with comments | « include/core/SkTRegistry.h ('k') | src/images/SkImageDecoder_FactoryRegistrar.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
13 12
14 extern SkImageDecoder* image_decoder_from_stream(SkStream*); 13 extern SkImageDecoder* image_decoder_from_stream(SkStream*);
15 14
16 SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) { 15 SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
17 return image_decoder_from_stream(stream); 16 return image_decoder_from_stream(stream);
18 } 17 }
19 18
20 ///////////////////////////////////////////////////////////////////////// 19 /////////////////////////////////////////////////////////////////////////
21 20
22 typedef SkTRegistry<SkMovie*, SkStream*> MovieReg; 21 typedef SkTRegistry<SkMovie*(*)(SkStream*)> MovieReg;
23 22
24 SkMovie* SkMovie::DecodeStream(SkStream* stream) { 23 SkMovie* SkMovie::DecodeStream(SkStream* stream) {
25 const MovieReg* curr = MovieReg::Head(); 24 const MovieReg* curr = MovieReg::Head();
26 while (curr) { 25 while (curr) {
27 SkMovie* movie = curr->factory()(stream); 26 SkMovie* movie = curr->factory()(stream);
28 if (movie) { 27 if (movie) {
29 return movie; 28 return movie;
30 } 29 }
31 // we must rewind only if we got NULL, since we gave the stream to the 30 // 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 31 // movie, who may have already started reading from it
33 stream->rewind(); 32 stream->rewind();
34 curr = curr->next(); 33 curr = curr->next();
35 } 34 }
36 return NULL; 35 return NULL;
37 } 36 }
OLDNEW
« no previous file with comments | « include/core/SkTRegistry.h ('k') | src/images/SkImageDecoder_FactoryRegistrar.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698