cc: Fix incomplete changes to add ETC1 support

cc/resources/ui_resource_bitmap.h

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);

[aelias_OOO_until_Jul13, 2013/11/07 19:30:27]

Then this doesn't need a gfx::Size either.

 
   ~UIResourceBitmap();