summaryrefslogtreecommitdiffstats
path: root/chromium/cc/resources/ui_resource_bitmap.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/cc/resources/ui_resource_bitmap.h')
-rw-r--r--chromium/cc/resources/ui_resource_bitmap.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/cc/resources/ui_resource_bitmap.h b/chromium/cc/resources/ui_resource_bitmap.h
index ea54f613b10..b8863d8e994 100644
--- a/chromium/cc/resources/ui_resource_bitmap.h
+++ b/chromium/cc/resources/ui_resource_bitmap.h
@@ -44,17 +44,17 @@ class CC_EXPORT UIResourceBitmap {
// User must ensure that |skbitmap| is immutable. The SkBitmap Format should
// be 32-bit RGBA.
explicit UIResourceBitmap(const SkBitmap& skbitmap);
-
- UIResourceBitmap(const skia::RefPtr<ETC1PixelRef>& etc1_pixel_ref,
- gfx::Size size);
-
+ UIResourceBitmap(const gfx::Size& size, bool is_opaque);
+ UIResourceBitmap(const skia::RefPtr<SkPixelRef>& pixel_ref,
+ const gfx::Size& size);
~UIResourceBitmap();
private:
friend class AutoLockUIResourceBitmap;
+
void Create(const skia::RefPtr<SkPixelRef>& pixel_ref,
- UIResourceFormat format,
- gfx::Size size);
+ const gfx::Size& size,
+ UIResourceFormat format);
skia::RefPtr<SkPixelRef> pixel_ref_;
UIResourceFormat format_;