| Index: gpu/command_buffer/service/texture_manager.h
|
| diff --git a/gpu/command_buffer/service/texture_manager.h b/gpu/command_buffer/service/texture_manager.h
|
| index ef9e020a601a8732f18876aa405dbefd14aae75e..3389a13dc6f9f4d85126b3ff6b8ffcd7b0429f50 100644
|
| --- a/gpu/command_buffer/service/texture_manager.h
|
| +++ b/gpu/command_buffer/service/texture_manager.h
|
| @@ -388,12 +388,12 @@ class GPU_EXPORT TextureManager {
|
| // True if this texture meets all the GLES2 criteria for rendering.
|
| // See section 3.8.2 of the GLES2 spec.
|
| bool CanRender(const TextureInfo* texture) const {
|
| - return texture->CanRender(feature_info_);
|
| + return texture->CanRender(feature_info_.get());
|
| }
|
|
|
| // Returns true if mipmaps can be generated by GL.
|
| bool CanGenerateMipmaps(const TextureInfo* texture) const {
|
| - return texture->CanGenerateMipmaps(feature_info_);
|
| + return texture->CanGenerateMipmaps(feature_info_.get());
|
| }
|
|
|
| // Sets the TextureInfo's target
|
| @@ -459,13 +459,13 @@ class GPU_EXPORT TextureManager {
|
| TextureInfo* GetDefaultTextureInfo(GLenum target) {
|
| switch (target) {
|
| case GL_TEXTURE_2D:
|
| - return default_textures_[kTexture2D];
|
| + return default_textures_[kTexture2D].get();
|
| case GL_TEXTURE_CUBE_MAP:
|
| - return default_textures_[kCubeMap];
|
| + return default_textures_[kCubeMap].get();
|
| case GL_TEXTURE_EXTERNAL_OES:
|
| - return default_textures_[kExternalOES];
|
| + return default_textures_[kExternalOES].get();
|
| case GL_TEXTURE_RECTANGLE_ARB:
|
| - return default_textures_[kRectangleARB];
|
| + return default_textures_[kRectangleARB].get();
|
| default:
|
| NOTREACHED();
|
| return NULL;
|
|
|