| Index: cc/resources/resource.h
|
| diff --git a/cc/resources/resource.h b/cc/resources/resource.h
|
| index 7962d6251fc18e2e1476022a87d80c7abecc4abb..b68b13650f3d0e217d1d74447628213ad1402635 100644
|
| --- a/cc/resources/resource.h
|
| +++ b/cc/resources/resource.h
|
| @@ -17,14 +17,16 @@ namespace cc {
|
| class CC_EXPORT Resource {
|
| public:
|
| Resource() : id_(0), format_(RGBA_8888) {}
|
| - Resource(unsigned id, const gfx::Size& size, ResourceFormat format)
|
| - : id_(id),
|
| - size_(size),
|
| - format_(format) {}
|
| + Resource(unsigned id,
|
| + const gfx::Size& size,
|
| + ResourceFormat format,
|
| + const gfx::ColorSpace& color_space)
|
| + : id_(id), size_(size), format_(format), color_space_(color_space) {}
|
|
|
| ResourceId id() const { return id_; }
|
| gfx::Size size() const { return size_; }
|
| ResourceFormat format() const { return format_; }
|
| + const gfx::ColorSpace& color_space() const { return color_space_; }
|
|
|
| protected:
|
| void set_id(ResourceId id) { id_ = id; }
|
| @@ -37,6 +39,7 @@ class CC_EXPORT Resource {
|
| ResourceId id_;
|
| gfx::Size size_;
|
| ResourceFormat format_;
|
| + gfx::ColorSpace color_space_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Resource);
|
| };
|
|
|