| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2006 The Android Open Source Project | 2 * Copyright 2006 The Android Open Source Project |
| 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 SkBitmap_DEFINED | 8 #ifndef SkBitmap_DEFINED |
| 9 #define SkBitmap_DEFINED | 9 #define SkBitmap_DEFINED |
| 10 | 10 |
| (...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 696 private: | 696 private: |
| 697 mutable SkPixelRef* fPixelRef; | 697 mutable SkPixelRef* fPixelRef; |
| 698 mutable int fPixelLockCount; | 698 mutable int fPixelLockCount; |
| 699 // These are just caches from the locked pixelref | 699 // These are just caches from the locked pixelref |
| 700 mutable void* fPixels; | 700 mutable void* fPixels; |
| 701 mutable SkColorTable* fColorTable; // only meaningful for kIndex8 | 701 mutable SkColorTable* fColorTable; // only meaningful for kIndex8 |
| 702 | 702 |
| 703 SkIPoint fPixelRefOrigin; | 703 SkIPoint fPixelRefOrigin; |
| 704 | 704 |
| 705 enum Flags { | 705 enum Flags { |
| 706 kImageIsOpaque_Flag = 0x01, | |
| 707 kImageIsVolatile_Flag = 0x02, | 706 kImageIsVolatile_Flag = 0x02, |
| 708 kImageIsImmutable_Flag = 0x04, | 707 kImageIsImmutable_Flag = 0x04, |
| 709 #ifdef SK_BUILD_FOR_ANDROID | 708 #ifdef SK_BUILD_FOR_ANDROID |
| 710 /* A hint for the renderer responsible for drawing this bitmap | 709 /* A hint for the renderer responsible for drawing this bitmap |
| 711 * indicating that it should attempt to use mipmaps when this bitmap | 710 * indicating that it should attempt to use mipmaps when this bitmap |
| 712 * is drawn scaled down. | 711 * is drawn scaled down. |
| 713 */ | 712 */ |
| 714 kHasHardwareMipMap_Flag = 0x08, | 713 kHasHardwareMipMap_Flag = 0x08, |
| 715 #endif | 714 #endif |
| 716 }; | 715 }; |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 848 #ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG | 847 #ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG |
| 849 /////////////////////////////////////////////////////////////////////////////// | 848 /////////////////////////////////////////////////////////////////////////////// |
| 850 // | 849 // |
| 851 // Helpers until we can fully deprecate SkBitmap::Config | 850 // Helpers until we can fully deprecate SkBitmap::Config |
| 852 // | 851 // |
| 853 SK_API SkBitmap::Config SkColorTypeToBitmapConfig(SkColorType); | 852 SK_API SkBitmap::Config SkColorTypeToBitmapConfig(SkColorType); |
| 854 SK_API SkColorType SkBitmapConfigToColorType(SkBitmap::Config); | 853 SK_API SkColorType SkBitmapConfigToColorType(SkBitmap::Config); |
| 855 #endif | 854 #endif |
| 856 | 855 |
| 857 #endif | 856 #endif |
| OLD | NEW |