cc: Fix BytesPerPixel issue and refactor.

cc/resources/resource_format.h

Index: cc/resources/resource_format.h
diff --git a/cc/resources/resource_format.h b/cc/resources/resource_format.h
index d785ab7382b8db450ed675580712d5b0675bc7fd..d910bb091e7e62e68282d2d5ba289ed218364f77 100644
--- a/cc/resources/resource_format.h
+++ b/cc/resources/resource_format.h
@@ -6,8 +6,14 @@
 #define CC_RESOURCES_RESOURCE_FORMAT_H_
 
 #include "base/logging.h"
+#include "cc/base/cc_export.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
+// TODO(prashant.n): Including third_party/khronos/GLES2/gl2.h causes
+// redefinition errors as macros/functions defined in it conflict with
+// macros/functions defined in ui/gl/gl_bindings.h. (http://crbug.com/512833).
+typedef unsigned int GLenum;
+
 namespace cc {
 
 // Keep in sync with arrays below.
@@ -25,6 +31,11 @@ enum ResourceFormat {
 
 SkColorType ResourceFormatToSkColorType(ResourceFormat format);
 
+CC_EXPORT int BitsPerPixel(ResourceFormat format);
+CC_EXPORT GLenum GLDataType(ResourceFormat format);
+CC_EXPORT GLenum GLDataFormat(ResourceFormat format);
+CC_EXPORT GLenum GLInternalFormat(ResourceFormat format);
+
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RESOURCE_FORMAT_H_