| Index: cc/resources/resource.cc | 
| diff --git a/cc/resources/resource.cc b/cc/resources/resource.cc | 
| index 192eaebddc6d0c09fbf35619c8605f3144dff4ac..63ed4149f5f8f7f0fb87b7544e9d2b882f4fde48 100644 | 
| --- a/cc/resources/resource.cc | 
| +++ b/cc/resources/resource.cc | 
| @@ -3,7 +3,6 @@ | 
| // found in the LICENSE file. | 
|  | 
| #include "cc/resources/resource.h" | 
| -#include "third_party/khronos/GLES2/gl2ext.h" | 
|  | 
| namespace cc { | 
|  | 
| @@ -14,26 +13,9 @@ size_t Resource::bytes() const { | 
| return MemorySizeBytes(size_, format_); | 
| } | 
|  | 
| -size_t Resource::BytesPerPixel(GLenum format) { | 
| -  size_t components_per_pixel = 0; | 
| -  size_t bytes_per_component = 1; | 
| -  switch (format) { | 
| -    case GL_RGBA: | 
| -    case GL_BGRA_EXT: | 
| -      components_per_pixel = 4; | 
| -      break; | 
| -    case GL_LUMINANCE: | 
| -      components_per_pixel = 1; | 
| -      break; | 
| -    default: | 
| -      NOTREACHED(); | 
| -  } | 
| -  return components_per_pixel * bytes_per_component; | 
| +size_t Resource::MemorySizeBytes( | 
| +    gfx::Size size, ResourceProvider::Format format) { | 
| +  return ResourceProvider::BytesPerPixel(format) * size.width() * size.height(); | 
| } | 
|  | 
| -size_t Resource::MemorySizeBytes(gfx::Size size, GLenum format) { | 
| -  return BytesPerPixel(format) * size.width() * size.height(); | 
| -} | 
| - | 
| - | 
| }  // namespace cc | 
|  |