Color: Add SetColorSpace member to gfx::GpuMemoryBuffer

components/display_compositor/buffer_queue.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/display_compositor/buffer_queue.h"
 
 #include "base/containers/adapters.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "components/display_compositor/gl_helper.h"
@@ skipping 89 matching lines @@
     }
     current_surface_->damage = gfx::Rect();
   }
   UpdateBufferDamage(damage);
   in_flight_surfaces_.push_back(std::move(current_surface_));
   // Some things reset the framebuffer (CopySubBufferDamage, some GLRenderer
   // paths), so ensure we restore it here.
   gl_->BindFramebuffer(GL_FRAMEBUFFER, fbo_);
 }
 
-void BufferQueue::Reshape(const gfx::Size& size, float scale_factor) {
-  if (size == size_)
+void BufferQueue::Reshape(const gfx::Size& size,
+                          float scale_factor,
+                          const gfx::ColorSpace& color_space) {
+  if (size == size_ && color_space == color_space_)

[hubbe, 2016/07/06 21:30:53]

Isn't this the kind of comparison you were worried about becoming a hotspot when
we talked earlier?

     return;
 #if !defined(OS_MACOSX)
   // TODO(ccameron): This assert is being hit on Mac try jobs. Determine if that
   // is cause for concern or if it is benign.
   // http://crbug.com/524624
   DCHECK(!current_surface_);
 #endif
   size_ = size;
+  color_space_ = color_space;
 
   // TODO: add stencil buffer when needed.
   gl_->BindFramebuffer(GL_FRAMEBUFFER, fbo_);
   gl_->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
                             texture_target_, 0, 0);
 
   FreeAllSurfaces();
 }
 
 void BufferQueue::RecreateBuffers() {
@@ skipping 81 matching lines @@
 
   std::unique_ptr<gfx::GpuMemoryBuffer> buffer(
       gpu_memory_buffer_manager_->AllocateGpuMemoryBuffer(
           size_, gpu::DefaultBufferFormatForImageFormat(internal_format_),
           gfx::BufferUsage::SCANOUT, surface_handle_));
   if (!buffer.get()) {
     gl_->DeleteTextures(1, &texture);
     DLOG(ERROR) << "Failed to allocate GPU memory buffer";
     return nullptr;
   }
+  buffer->SetColorSpaceForScanout(color_space_);
 
   uint32_t id =
       gl_->CreateImageCHROMIUM(buffer->AsClientBuffer(), size_.width(),
                                size_.height(), internal_format_);
   if (!id) {
     LOG(ERROR) << "Failed to allocate backing image surface";
     gl_->DeleteTextures(1, &texture);
     return nullptr;
   }
 
@@ skipping 14 matching lines @@
       buffer(buffer.release()),
       texture(texture),
       image(image),
       damage(rect) {}
 
 BufferQueue::AllocatedSurface::~AllocatedSurface() {
   buffer_queue->FreeSurfaceResources(this);
 }
 
 }  // namespace display_compositor