| Index: cc/resources/resource_provider.h
|
| diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
|
| index ea9588a2fd47958d4e3e58a5a608feaab7d6b93a..f7baac1e3bb1447b60b10bee6aef281a7904a778 100644
|
| --- a/cc/resources/resource_provider.h
|
| +++ b/cc/resources/resource_provider.h
|
| @@ -223,14 +223,15 @@ class CC_EXPORT ResourceProvider {
|
| ResourceProvider::ResourceId resource_id);
|
| virtual ~ScopedReadLockGL();
|
|
|
| - unsigned texture_id() const { return texture_id_; }
|
| + unsigned texture_id() const { return resource_->gl_id; }
|
| + GLenum target() const { return resource_->target; }
|
|
|
| protected:
|
| ResourceProvider* resource_provider_;
|
| ResourceProvider::ResourceId resource_id_;
|
|
|
| private:
|
| - unsigned texture_id_;
|
| + const ResourceProvider::Resource* resource_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ScopedReadLockGL);
|
| };
|
|
|