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..c707d669afef5c4b3ddae559b67bc570c0e90a03 100644
--- a/cc/resources/resource_format.h
+++ b/cc/resources/resource_format.h
@@ -6,8 +6,12 @@
 #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): Remove GLenum typedef.
+typedef unsigned int GLenum;

[vmpstr, 2015/07/14 17:44:15]

Can you instead include one of the following? (whichever provides GLenum)

"third_party/khronos/GLES2/gl2.h"
"third_party/khronos/GLES2/gl2ext.h"

[prashant.n, 2015/07/16 05:54:02]

Including third_party/khronos/GLES2/gl2.h causes redefinition errors with
third_party/mesa/src/include/GL/gl.h.

+
 namespace cc {
 
 // Keep in sync with arrays below.
@@ -25,6 +29,11 @@ enum ResourceFormat {
 
 SkColorType ResourceFormatToSkColorType(ResourceFormat format);
 
+CC_EXPORT extern int BitsPerPixel(ResourceFormat format);
+CC_EXPORT extern GLenum GLDataType(ResourceFormat format);
+CC_EXPORT extern GLenum GLDataFormat(ResourceFormat format);
+CC_EXPORT extern GLenum GLInternalFormat(ResourceFormat format);
+
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RESOURCE_FORMAT_H_