cc: Adding support for RGBA_4444 tile textures

cc/resources/resource.cc

Index: cc/resources/resource.cc
diff --git a/cc/resources/resource.cc b/cc/resources/resource.cc
index 192eaebddc6d0c09fbf35619c8605f3144dff4ac..3fbe0be2050b407393c228acbd0c6a5649795e95 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 {
 
@@ -11,28 +10,13 @@ size_t Resource::bytes() const {
   if (size_.IsEmpty())
     return 0;
 
-  return MemorySizeBytes(size_, format_);
+  return MemorySizeBytes(size_, format_, type_);
 }
 
-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, GLenum format) {
-  return BytesPerPixel(format) * size.width() * size.height();
+size_t Resource::MemorySizeBytes(
+    gfx::Size size, GLenum format, ResourceProvider::TextureType type) {
+  return ResourceProvider::BytesPerPixel(format, type)
+      * size.width() * size.height();
 }