cc: Add color conversion support to all DrawQuad types

cc/output/gl_renderer.h

 // Copyright 2010 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.
 
 #ifndef CC_OUTPUT_GL_RENDERER_H_
 #define CC_OUTPUT_GL_RENDERER_H_
 
 #include <deque>
 #include <vector>
 
@@ skipping 197 matching lines @@
   void SetShaderQuadF(const gfx::QuadF& quad);
   void SetShaderMatrix(const gfx::Transform& transform);
   void SetShaderColor(SkColor color, float opacity);
   void DrawQuadGeometryClippedByQuadF(const gfx::Transform& draw_transform,
                                       const gfx::RectF& quad_rect,
                                       const gfx::QuadF& clipping_region_quad,
                                       const float uv[8]);
   void DrawQuadGeometry(const gfx::Transform& projection_matrix,
                         const gfx::Transform& draw_transform,
                         const gfx::RectF& quad_rect);
-  void SetUseProgram(const Program* program);
+
+  // If |dst_color_space| is invalid, then no color conversion (apart from
+  // YUV to RGB conversion) is performed. This explicit argument is available
+  // so that video color conversion can be enabled separately from general color
+  // conversion.
+  // TODO(ccameron): Remove the version with an explicit |dst_color_space|,
+  // since that will always be the device color space.
+  void SetUseProgram(const ProgramKey& program_key,
+                     const gfx::ColorSpace& src_color_space,
+                     const gfx::ColorSpace& dst_color_space);
+  void SetUseProgram(const ProgramKey& program_key,
+                     const gfx::ColorSpace& src_color_space);
 
   bool MakeContextCurrent();
 
   void InitializeSharedObjects();
   void CleanupSharedObjects();
 
   typedef base::Callback<void(std::unique_ptr<CopyOutputRequest> copy_request,
                               bool success)>
       AsyncGetFramebufferPixelsCleanupCallback;
   void FinishedReadback(unsigned source_buffer,
@@ skipping 44 matching lines @@
   // Resources that the GPU process has finished swapping. The key is the
   // texture id of the resource.
   std::map<unsigned, OverlayResourceLock> swapped_and_acked_overlay_resources_;
 
   unsigned offscreen_framebuffer_id_ = 0u;
 
   std::unique_ptr<StaticGeometryBinding> shared_geometry_;
   std::unique_ptr<DynamicGeometryBinding> clipped_geometry_;
   gfx::QuadF shared_geometry_quad_;
 
-  // If the requested program has not yet been initialized, this will initialize
-  // the program before returning it.
-  const Program* GetProgram(const ProgramKey& key);
-
   // This will return nullptr if the requested program has not yet been
   // initialized.
   const Program* GetProgramIfInitialized(const ProgramKey& key) const;
 
   std::unordered_map<ProgramKey, std::unique_ptr<Program>, ProgramKeyHash>
       program_cache_;
 
   gpu::gles2::GLES2Interface* gl_;
   gpu::ContextSupport* context_support_;
   std::unique_ptr<ContextCacheController::ScopedVisibility> context_visibility_;
 
   TextureMailboxDeleter* texture_mailbox_deleter_;
 
   gfx::Rect swap_buffer_rect_;
   gfx::Rect scissor_rect_;
   bool is_scissor_enabled_ = false;
   bool stencil_shadow_ = false;
   bool blend_shadow_ = false;
-  const Program* program_shadow_ = nullptr;
+  const Program* current_program_ = nullptr;

[enne (OOO), 2017/02/10 22:40:42]

I considered suggesting this rename earlier...so thumbs up!

   TexturedQuadDrawCache draw_cache_;
   int highp_threshold_min_ = 0;
   int highp_threshold_cache_ = 0;
 
   struct PendingAsyncReadPixels;
   std::vector<std::unique_ptr<PendingAsyncReadPixels>>
       pending_async_read_pixels_;
 
   std::unique_ptr<ResourceProvider::ScopedWriteLockGL>
       current_framebuffer_lock_;
@@ skipping 31 matching lines @@
   gfx::Size offscreen_stencil_renderbuffer_size_;
 
   base::WeakPtrFactory<GLRenderer> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GLRenderer);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_GL_RENDERER_H_