| Index: cc/resources/resource_provider.h
|
| diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
|
| index e2b97c6210489c78023f0634ff71c54802db685f..54c308c686ae4cec550eaa9a84b878e61e2d179a 100644
|
| --- a/cc/resources/resource_provider.h
|
| +++ b/cc/resources/resource_provider.h
|
| @@ -222,13 +222,14 @@ class CC_EXPORT ResourceProvider
|
| GLenum target() const { return target_; }
|
| const gfx::Size& size() const { return size_; }
|
|
|
| - private:
|
| + protected:
|
| ResourceProvider* resource_provider_;
|
| ResourceId resource_id_;
|
| unsigned texture_id_;
|
| GLenum target_;
|
| gfx::Size size_;
|
|
|
| + private:
|
| DISALLOW_COPY_AND_ASSIGN(ScopedReadLockGL);
|
| };
|
|
|
| @@ -346,6 +347,24 @@ class CC_EXPORT ResourceProvider
|
| DISALLOW_COPY_AND_ASSIGN(ScopedReadLockSoftware);
|
| };
|
|
|
| + class CC_EXPORT ScopedReadLockSkImage {
|
| + public:
|
| + ScopedReadLockSkImage(ResourceProvider* resource_provider,
|
| + ResourceId resource_id);
|
| + ~ScopedReadLockSkImage();
|
| +
|
| + const SkImage* sk_image() const { return sk_image_.get(); }
|
| +
|
| + bool valid() const { return !!sk_image_; }
|
| +
|
| + private:
|
| + ResourceProvider* resource_provider_;
|
| + ResourceId resource_id_;
|
| + sk_sp<SkImage> sk_image_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(ScopedReadLockSkImage);
|
| + };
|
| +
|
| class CC_EXPORT ScopedWriteLockSoftware {
|
| public:
|
| ScopedWriteLockSoftware(ResourceProvider* resource_provider,
|
|
|