Chromium Code Reviews| Index: cc/resources/ui_resource_bitmap.h |
| diff --git a/cc/resources/ui_resource_bitmap.h b/cc/resources/ui_resource_bitmap.h |
| index 78cb465812570f499c79d9ab53edd11c50666e7b..9d1b428d5db917c85708a40bc1d0a36635903990 100644 |
| --- a/cc/resources/ui_resource_bitmap.h |
| +++ b/cc/resources/ui_resource_bitmap.h |
| @@ -24,7 +24,8 @@ namespace cc { |
| class CC_EXPORT UIResourceBitmap { |
| public: |
| enum UIResourceFormat { |
| - RGBA8 |
| + RGBA8, |
| + ETC1 |
| }; |
| enum UIResourceWrapMode { |
| CLAMP_TO_EDGE, |
| @@ -41,6 +42,11 @@ class CC_EXPORT UIResourceBitmap { |
| UIResourceBitmap(const SkBitmap& skbitmap, |
| UIResourceWrapMode wrap_mode = CLAMP_TO_EDGE); |
| + UIResourceBitmap(const skia::RefPtr<SkPixelRef>& pixel_ref, |
| + UIResourceFormat format, |
| + UIResourceWrapMode wrap_mode, |
|
aelias_OOO_until_Jul13
2013/10/18 01:59:24
Could you move wrap_mode out of the constructors a
powei
2013/10/23 05:36:15
Done.
|
| + gfx::Size size); |
| + |
| ~UIResourceBitmap(); |
| private: |