1. With introduction of compressed formats, e.g. ETC1, the number of

bits per pixel is becoming less than 8. Computing bytes per pixel by
BitsPerPixel(format) / 8, might give different values. So compute the
bits per row first and divide it by 8 to get the bytes per row.

2. Move resource size computation functions to separate file,
i.e. resource_util.cc.

3. Move resource format related functions to resource_format.h. As
there is dependecy on third_party/khronos/GLES2/gl2.h &
third_party/khronos/GLES2/gl2ext.h, the inlined functions have been
written as non-inlined functions and header files have been included
in resource_format.cc.
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1202843008

Cr-Commit-Position: refs/heads/master@{#341492}

1 files changed, 3 insertions, 1 deletions

diff --git a/cc/resources/resource_pool_unittest.cc b/cc/resources/resource_pool_unittest.cc
index 96e7591..035b19e 100644
--- a/cc/resources/resource_pool_unittest.cc
+++ b/cc/resources/resource_pool_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "cc/resources/resource_pool.h"
 
+#include "cc/resources/resource_util.h"
 #include "cc/resources/scoped_resource.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
@@ -54,7 +55,8 @@ TEST_F(ResourcePoolTest, AccountingSingleResource) {
 
   gfx::Size size(100, 100);
   ResourceFormat format = RGBA_8888;
-  size_t resource_bytes = Resource::UncheckedMemorySizeBytes(size, format);
+  size_t resource_bytes =
+      ResourceUtil::UncheckedSizeInBytes<size_t>(size, format);
   scoped_ptr<ScopedResource> resource =
       resource_pool_->AcquireResource(size, format);