| 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 | 
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 94 | 94 | 
| 95 protected: | 95 protected: | 
| 96     SkCodec(const SkImageInfo&, SkStream*); | 96     SkCodec(const SkImageInfo&, SkStream*); | 
| 97 | 97 | 
| 98     /** | 98     /** | 
| 99      *  The SkAlphaType is a conservative answer. i.e. it is possible that it | 99      *  The SkAlphaType is a conservative answer. i.e. it is possible that it | 
| 100      *  initially returns a non-opaque answer, but completing the decode | 100      *  initially returns a non-opaque answer, but completing the decode | 
| 101      *  reveals that the image is actually opaque. | 101      *  reveals that the image is actually opaque. | 
| 102      */ | 102      */ | 
| 103 #ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO | 103 #ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO | 
| 104     bool onGetInfo(SkImageInfo* info) SK_OVERRIDE { | 104     bool onGetInfo(SkImageInfo* info) override { | 
| 105         *info = fInfo; | 105         *info = fInfo; | 
| 106         return true; | 106         return true; | 
| 107     } | 107     } | 
| 108 #endif | 108 #endif | 
| 109 | 109 | 
| 110     virtual SkISize onGetScaledDimensions(float /* desiredScale */) const { | 110     virtual SkISize onGetScaledDimensions(float /* desiredScale */) const { | 
| 111         // By default, scaling is not supported. | 111         // By default, scaling is not supported. | 
| 112         return fInfo.dimensions(); | 112         return fInfo.dimensions(); | 
| 113     } | 113     } | 
| 114 | 114 | 
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 157 | 157 | 
| 158 private: | 158 private: | 
| 159     const SkImageInfo                   fInfo; | 159     const SkImageInfo                   fInfo; | 
| 160     SkAutoTDelete<SkStream>             fStream; | 160     SkAutoTDelete<SkStream>             fStream; | 
| 161     bool                                fNeedsRewind; | 161     bool                                fNeedsRewind; | 
| 162     SkAutoTDelete<SkScanlineDecoder>    fScanlineDecoder; | 162     SkAutoTDelete<SkScanlineDecoder>    fScanlineDecoder; | 
| 163 | 163 | 
| 164     typedef SkImageGenerator INHERITED; | 164     typedef SkImageGenerator INHERITED; | 
| 165 }; | 165 }; | 
| 166 #endif // SkCodec_DEFINED | 166 #endif // SkCodec_DEFINED | 
| OLD | NEW | 
|---|