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

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

Issue 98703002: Fix compilation with SK_ENABLE_INST_COUNT=1 (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years 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 | « src/images/SkImageDecoder.cpp ('k') | src/lazy/SkBitmapFactory.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 2011 Google Inc. 3 * Copyright 2011 Google Inc.
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 #include "SkMovie.h" 8 #include "SkMovie.h"
9 #include "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkPaint.h" 10 #include "SkPaint.h"
11 11
12 SK_DEFINE_INST_COUNT(SkMovie)
13
14 // We should never see this in normal operation since our time values are 12 // We should never see this in normal operation since our time values are
15 // 0-based. So we use it as a sentinal. 13 // 0-based. So we use it as a sentinal.
16 #define UNINITIALIZED_MSEC ((SkMSec)-1) 14 #define UNINITIALIZED_MSEC ((SkMSec)-1)
17 15
18 SkMovie::SkMovie() 16 SkMovie::SkMovie()
19 { 17 {
20 fInfo.fDuration = UNINITIALIZED_MSEC; // uninitialized 18 fInfo.fDuration = UNINITIALIZED_MSEC; // uninitialized
21 fCurrTime = UNINITIALIZED_MSEC; // uninitialized 19 fCurrTime = UNINITIALIZED_MSEC; // uninitialized
22 fNeedBitmap = true; 20 fNeedBitmap = true;
23 } 21 }
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 86
89 SkMovie* SkMovie::DecodeMemory(const void* data, size_t length) { 87 SkMovie* SkMovie::DecodeMemory(const void* data, size_t length) {
90 SkMemoryStream stream(data, length, false); 88 SkMemoryStream stream(data, length, false);
91 return SkMovie::DecodeStream(&stream); 89 return SkMovie::DecodeStream(&stream);
92 } 90 }
93 91
94 SkMovie* SkMovie::DecodeFile(const char path[]) { 92 SkMovie* SkMovie::DecodeFile(const char path[]) {
95 SkAutoTUnref<SkStreamRewindable> stream(SkStream::NewFromFile(path)); 93 SkAutoTUnref<SkStreamRewindable> stream(SkStream::NewFromFile(path));
96 return stream.get() ? SkMovie::DecodeStream(stream) : NULL; 94 return stream.get() ? SkMovie::DecodeStream(stream) : NULL;
97 } 95 }
OLDNEW
« no previous file with comments | « src/images/SkImageDecoder.cpp ('k') | src/lazy/SkBitmapFactory.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698