| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef SkCodec_DEFINED | 8 #ifndef SkCodec_DEFINED |
| 9 #define SkCodec_DEFINED | 9 #define SkCodec_DEFINED |
| 10 | 10 |
| 11 #include "../private/SkTemplates.h" |
| 11 #include "SkColor.h" | 12 #include "SkColor.h" |
| 12 #include "SkEncodedFormat.h" | 13 #include "SkEncodedFormat.h" |
| 13 #include "SkImageInfo.h" | 14 #include "SkImageInfo.h" |
| 14 #include "SkSize.h" | 15 #include "SkSize.h" |
| 15 #include "SkStream.h" | 16 #include "SkStream.h" |
| 16 #include "SkTemplates.h" | |
| 17 #include "SkTypes.h" | 17 #include "SkTypes.h" |
| 18 | 18 |
| 19 class SkData; | 19 class SkData; |
| 20 | 20 |
| 21 /** | 21 /** |
| 22 * Abstraction layer directly on top of an image codec. | 22 * Abstraction layer directly on top of an image codec. |
| 23 */ | 23 */ |
| 24 class SkCodec : SkNoncopyable { | 24 class SkCodec : SkNoncopyable { |
| 25 public: | 25 public: |
| 26 /** | 26 /** |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 SkStream* stream() { | 260 SkStream* stream() { |
| 261 return fStream.get(); | 261 return fStream.get(); |
| 262 } | 262 } |
| 263 | 263 |
| 264 private: | 264 private: |
| 265 const SkImageInfo fInfo; | 265 const SkImageInfo fInfo; |
| 266 SkAutoTDelete<SkStream> fStream; | 266 SkAutoTDelete<SkStream> fStream; |
| 267 bool fNeedsRewind; | 267 bool fNeedsRewind; |
| 268 }; | 268 }; |
| 269 #endif // SkCodec_DEFINED | 269 #endif // SkCodec_DEFINED |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1272293004:
Move SkTemplates.h to private. (Closed)
Base URL: https://skia.googlesource.com/skia.git@master