cc: Add color conversion support to all DrawQuad types

cc/output/program_binding.cc

 // Copyright 2011 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 "cc/output/program_binding.h"
 
 #include "base/trace_event/trace_event.h"
 #include "cc/output/geometry_binding.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
@@ skipping 14 matching lines @@
          premultiplied_alpha_ == other.premultiplied_alpha_ &&
          has_background_color_ == other.has_background_color_ &&
          mask_mode_ == other.mask_mode_ &&
          mask_for_background_ == other.mask_for_background_ &&
          has_color_matrix_ == other.has_color_matrix_ &&
          yuv_alpha_texture_mode_ == other.yuv_alpha_texture_mode_ &&
          uv_texture_mode_ == other.uv_texture_mode_ &&
          color_conversion_mode_ == other.color_conversion_mode_;
 }
 
+bool ProgramKey::operator!=(const ProgramKey& other) const {
+  return !(*this == other);
+}
+
 // static
 ProgramKey ProgramKey::DebugBorder() {
   ProgramKey result;
   result.type_ = PROGRAM_TYPE_DEBUG_BORDER;
   return result;
 }
 
 // static
 ProgramKey ProgramKey::SolidColor(AAMode aa_mode) {
   ProgramKey result;
@@ skipping 58 matching lines @@
   result.type_ = PROGRAM_TYPE_VIDEO_STREAM;
   result.precision_ = precision;
   result.sampler_ = SAMPLER_TYPE_EXTERNAL_OES;
   return result;
 }
 
 // static
 ProgramKey ProgramKey::YUVVideo(TexCoordPrecision precision,
                                 SamplerType sampler,
                                 YUVAlphaTextureMode yuv_alpha_texture_mode,
-                                UVTextureMode uv_texture_mode,
-                                ColorConversionMode color_conversion_mode) {
+                                UVTextureMode uv_texture_mode) {
   ProgramKey result;
   result.type_ = PROGRAM_TYPE_YUV_VIDEO;
   result.precision_ = precision;
   result.sampler_ = sampler;
   result.yuv_alpha_texture_mode_ = yuv_alpha_texture_mode;
   DCHECK(yuv_alpha_texture_mode == YUV_NO_ALPHA_TEXTURE ||
          yuv_alpha_texture_mode == YUV_HAS_ALPHA_TEXTURE);
   result.uv_texture_mode_ = uv_texture_mode;
   DCHECK(uv_texture_mode == UV_TEXTURE_MODE_UV ||
          uv_texture_mode == UV_TEXTURE_MODE_U_V);
-  result.color_conversion_mode_ = color_conversion_mode;
   return result;
 }
 
 ProgramBindingBase::ProgramBindingBase()
     : program_(0),
       vertex_shader_id_(0),
       fragment_shader_id_(0),
       initialized_(false) {}
 
 ProgramBindingBase::~ProgramBindingBase() {
@@ skipping 114 matching lines @@
     context->DeleteShader(fragment_shader_id_);
     fragment_shader_id_ = 0;
   }
 }
 
 bool ProgramBindingBase::IsContextLost(GLES2Interface* context) {
   return context->GetGraphicsResetStatusKHR() != GL_NO_ERROR;
 }
 
 }  // namespace cc