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

Side by Side Diff: include/core/SkBitmap.h

Issue 387083002: Remove kImageIsImmutable_Flag. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase + better validation for Flags. Created 6 years, 5 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 | « no previous file | src/core/SkBitmap.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 * 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 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 mutable SkPixelRef* fPixelRef; 719 mutable SkPixelRef* fPixelRef;
720 mutable int fPixelLockCount; 720 mutable int fPixelLockCount;
721 // These are just caches from the locked pixelref 721 // These are just caches from the locked pixelref
722 mutable void* fPixels; 722 mutable void* fPixels;
723 mutable SkColorTable* fColorTable; // only meaningful for kIndex8 723 mutable SkColorTable* fColorTable; // only meaningful for kIndex8
724 724
725 SkIPoint fPixelRefOrigin; 725 SkIPoint fPixelRefOrigin;
726 726
727 enum Flags { 727 enum Flags {
728 kImageIsVolatile_Flag = 0x02, 728 kImageIsVolatile_Flag = 0x02,
729 kImageIsImmutable_Flag = 0x04,
730 #ifdef SK_BUILD_FOR_ANDROID 729 #ifdef SK_BUILD_FOR_ANDROID
731 /* A hint for the renderer responsible for drawing this bitmap 730 /* A hint for the renderer responsible for drawing this bitmap
732 * indicating that it should attempt to use mipmaps when this bitmap 731 * indicating that it should attempt to use mipmaps when this bitmap
733 * is drawn scaled down. 732 * is drawn scaled down.
734 */ 733 */
735 kHasHardwareMipMap_Flag = 0x08, 734 kHasHardwareMipMap_Flag = 0x08,
736 #endif 735 #endif
737 }; 736 };
738 737
739 SkImageInfo fInfo; 738 SkImageInfo fInfo;
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 #ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG 868 #ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
870 /////////////////////////////////////////////////////////////////////////////// 869 ///////////////////////////////////////////////////////////////////////////////
871 // 870 //
872 // Helpers until we can fully deprecate SkBitmap::Config 871 // Helpers until we can fully deprecate SkBitmap::Config
873 // 872 //
874 SK_API SkBitmap::Config SkColorTypeToBitmapConfig(SkColorType); 873 SK_API SkBitmap::Config SkColorTypeToBitmapConfig(SkColorType);
875 SK_API SkColorType SkBitmapConfigToColorType(SkBitmap::Config); 874 SK_API SkColorType SkBitmapConfigToColorType(SkBitmap::Config);
876 #endif 875 #endif
877 876
878 #endif 877 #endif
OLDNEW
« no previous file with comments | « no previous file | src/core/SkBitmap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698