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

Unified Diff: cc/resources/ui_resource_bitmap.h

Issue 41903003: cc: Fix incomplete changes to add ETC1 support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed compilation issues Created 7 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/resource_provider.cc ('k') | cc/resources/ui_resource_bitmap.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/ui_resource_bitmap.h
diff --git a/cc/resources/ui_resource_bitmap.h b/cc/resources/ui_resource_bitmap.h
index d0f717a7b2bd00b4966fdfa7b47e48ed1a7022af..ea54f613b10d043f0afbdff8b592f88ff6bdb5fe 100644
--- a/cc/resources/ui_resource_bitmap.h
+++ b/cc/resources/ui_resource_bitmap.h
@@ -17,7 +17,9 @@ class SkBitmap;
namespace cc {
-// A bitmap class that contains a ref-counted reference to a SkPixelRef* that
+class ETC1PixelRef;
+
+// A bitmap class that contains a ref-counted reference to a SkPixelRef that
// holds the content of the bitmap (cannot use SkBitmap because of ETC1).
// Thread-safety (by ways of SkPixelRef) ensures that both main and impl threads
// can hold references to the bitmap and that asynchronous uploads are allowed.
@@ -39,13 +41,11 @@ class CC_EXPORT UIResourceBitmap {
bool GetOpaque() const { return opaque_; }
void SetOpaque(bool opaque) { opaque_ = opaque; }
- // The constructor for the UIResourceBitmap. User must ensure that |skbitmap|
- // is immutable. The SkBitmap format should be in 32-bit RGBA. Wrap mode is
- // unnecessary for most UI resources and is defaulted to CLAMP_TO_EDGE.
+ // User must ensure that |skbitmap| is immutable. The SkBitmap Format should
+ // be 32-bit RGBA.
explicit UIResourceBitmap(const SkBitmap& skbitmap);
- UIResourceBitmap(const skia::RefPtr<SkPixelRef>& pixel_ref,
- UIResourceFormat format,
+ UIResourceBitmap(const skia::RefPtr<ETC1PixelRef>& etc1_pixel_ref,
gfx::Size size);
~UIResourceBitmap();
« no previous file with comments | « cc/resources/resource_provider.cc ('k') | cc/resources/ui_resource_bitmap.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698