cc: Fix R_8 GpuMemoryBuffers

cc/resources/resource_provider.cc

Index: cc/resources/resource_provider.cc
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index 9ea7b6dd20a3025bea933b08802e7a8729fb33ee..b4d674fc947464a41d8560542f93f5d52d467b23 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -613,6 +613,10 @@ ResourceProvider::ResourceType ResourceProvider::GetResourceType(
   return GetResource(id)->type;
 }
 
+GLenum ResourceProvider::GetResourceTextureTarget(ResourceId id) {
+  return GetResource(id)->target;
+}
+
 void ResourceProvider::CopyToResource(ResourceId id,
                                       const uint8_t* image,
                                       const gfx::Size& image_size) {
@@ -1448,11 +1452,6 @@ void ResourceProvider::CreateForTesting(ResourceId id) {
   LazyCreate(GetResource(id));
 }
 
-GLenum ResourceProvider::TargetForTesting(ResourceId id) {
-  Resource* resource = GetResource(id);
-  return resource->target;
-}
-
 void ResourceProvider::LazyCreate(Resource* resource) {
   if (resource->type != RESOURCE_TYPE_GL_TEXTURE ||
       resource->origin != Resource::INTERNAL)
@@ -1502,7 +1501,7 @@ void ResourceProvider::LazyAllocate(Resource* resource) {
     resource->gpu_memory_buffer =
         gpu_memory_buffer_manager_->AllocateGpuMemoryBuffer(
                                       size, BufferFormat(format),
-                                      gfx::BufferUsage::SCANOUT)
+                                      gfx::BufferUsage::GPU_READ_CPU_READ_WRITE)
             .release();
     LazyCreateImage(resource);
     resource->dirty_image = true;
@@ -1540,7 +1539,7 @@ void ResourceProvider::LazyCreateImage(Resource* resource) {
 #endif
     resource->image_id = gl->CreateImageCHROMIUM(
         resource->gpu_memory_buffer->AsClientBuffer(), resource->size.width(),
-        resource->size.height(), GLInternalFormat(resource->format));
+        resource->size.height(), GLImageFormat(resource->format));
   }
 }