| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 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 SkImage_DEFINED | 8 #ifndef SkImage_DEFINED |
| 9 #define SkImage_DEFINED | 9 #define SkImage_DEFINED |
| 10 | 10 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 static SkImage* NewRasterData(const Info&, SkData* pixels, size_t rowBytes); | 41 static SkImage* NewRasterData(const Info&, SkData* pixels, size_t rowBytes); |
| 42 static SkImage* NewEncodedData(SkData*); | 42 static SkImage* NewEncodedData(SkData*); |
| 43 | 43 |
| 44 /** | 44 /** |
| 45 * GrTexture is a more logical parameter for this factory, but its | 45 * GrTexture is a more logical parameter for this factory, but its |
| 46 * interactions with scratch cache still has issues, so for now we take | 46 * interactions with scratch cache still has issues, so for now we take |
| 47 * SkBitmap instead. This will be changed in the future. skbug.com/1449 | 47 * SkBitmap instead. This will be changed in the future. skbug.com/1449 |
| 48 */ | 48 */ |
| 49 static SkImage* NewTexture(const SkBitmap&); | 49 static SkImage* NewTexture(const SkBitmap&); |
| 50 | 50 |
| 51 virtual bool isOpaque() const { return false; } |
| 52 |
| 51 /** | 53 /** |
| 52 * Construct a new SkImage based on the given ImageGenerator. | 54 * Construct a new SkImage based on the given ImageGenerator. |
| 53 * This function will always take ownership of the passed | 55 * This function will always take ownership of the passed |
| 54 * ImageGenerator. Returns NULL on error. | 56 * ImageGenerator. Returns NULL on error. |
| 55 */ | 57 */ |
| 56 static SkImage* NewFromGenerator(SkImageGenerator*); | 58 static SkImage* NewFromGenerator(SkImageGenerator*); |
| 57 | 59 |
| 58 int width() const { return fWidth; } | 60 int width() const { return fWidth; } |
| 59 int height() const { return fHeight; } | 61 int height() const { return fHeight; } |
| 60 uint32_t uniqueID() const { return fUniqueID; } | 62 uint32_t uniqueID() const { return fUniqueID; } |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 * On failure, false will be returned, and bitmap will unmodified. | 141 * On failure, false will be returned, and bitmap will unmodified. |
| 140 */ | 142 */ |
| 141 // On ice for now: | 143 // On ice for now: |
| 142 // - should it respect the particular colortype/alphatype of the src | 144 // - should it respect the particular colortype/alphatype of the src |
| 143 // - should it have separate entrypoints for preallocated and not bitmaps? | 145 // - should it have separate entrypoints for preallocated and not bitmaps? |
| 144 // - isn't it enough to allow the caller to draw() the image into a canvas? | 146 // - isn't it enough to allow the caller to draw() the image into a canvas? |
| 145 bool readPixels(SkBitmap* bitmap, const SkIRect* subset = NULL) const; | 147 bool readPixels(SkBitmap* bitmap, const SkIRect* subset = NULL) const; |
| 146 }; | 148 }; |
| 147 | 149 |
| 148 #endif | 150 #endif |
| OLD | NEW |