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

Side by Side Diff: src/images/SkImageDecoder_FactoryDefault.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT 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 unified diff | Download patch
« no previous file with comments | « src/images/SkImageDecoder.cpp ('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 12
13 extern SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*); 13 extern SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*);
14 14
15 SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) { 15 SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) {
16 return image_decoder_from_stream(stream); 16 return image_decoder_from_stream(stream);
17 } 17 }
18 18
19 ///////////////////////////////////////////////////////////////////////// 19 /////////////////////////////////////////////////////////////////////////
20 20
21 typedef SkTRegistry<SkMovie*(*)(SkStreamRewindable*)> MovieReg; 21 typedef SkTRegistry<SkMovie*(*)(SkStreamRewindable*)> MovieReg;
22 22
23 SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) { 23 SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) {
24 const MovieReg* curr = MovieReg::Head(); 24 const MovieReg* curr = MovieReg::Head();
25 while (curr) { 25 while (curr) {
26 SkMovie* movie = curr->factory()(stream); 26 SkMovie* movie = curr->factory()(stream);
27 if (movie) { 27 if (movie) {
28 return movie; 28 return movie;
29 } 29 }
30 // we must rewind only if we got NULL, since we gave the stream to the 30 // we must rewind only if we got nullptr, since we gave the stream to th e
31 // movie, who may have already started reading from it 31 // movie, who may have already started reading from it
32 stream->rewind(); 32 stream->rewind();
33 curr = curr->next(); 33 curr = curr->next();
34 } 34 }
35 return NULL; 35 return nullptr;
36 } 36 }
OLDNEW
« no previous file with comments | « src/images/SkImageDecoder.cpp ('k') | src/images/SkImageDecoder_FactoryRegistrar.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698