cc: Separate YUV from LUT color conversion

cc/output/program_binding.h

 // 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.
 
 #ifndef CC_OUTPUT_PROGRAM_BINDING_H_
 #define CC_OUTPUT_PROGRAM_BINDING_H_
 
 #include <string>
 
 #include "base/logging.h"
@@ skipping 248 matching lines @@
   int uv_texture_location() const {
     return fragment_shader_.uv_texture_location_;
   }
   int a_texture_location() const {
     return fragment_shader_.a_texture_location_;
   }
   int lut_texture_location() const {
     return fragment_shader_.lut_texture_location_;
   }
   int lut_size_location() const { return fragment_shader_.lut_size_location_; }
-  int yuv_matrix_location() const {
-    return fragment_shader_.yuv_matrix_location_;
+  int yuv_and_resource_matrix_location() const {
+    return fragment_shader_.yuv_and_resource_matrix_location_;
   }
-  int yuv_adj_location() const { return fragment_shader_.yuv_adj_location_; }
   int ya_clamp_rect_location() const {
     return fragment_shader_.ya_clamp_rect_location_;
   }
   int uv_clamp_rect_location() const {
     return fragment_shader_.uv_clamp_rect_location_;
   }
-  int resource_multiplier_location() const {
-    return fragment_shader_.resource_multiplier_location_;
-  }
-  int resource_offset_location() const {
-    return fragment_shader_.resource_offset_location_;
-  }
 
  private:
   void InitializeDebugBorderProgram() {
     // Initialize vertex program.
     vertex_shader_.has_matrix_ = true;
 
     // Initialize fragment program.
     fragment_shader_.input_color_type_ = INPUT_COLOR_SOURCE_UNIFORM;
     fragment_shader_.frag_color_mode_ = FRAG_COLOR_MODE_DEFAULT;
   }
@@ skipping 128 matching lines @@
 
   VertexShader vertex_shader_;
   FragmentShader fragment_shader_;
 
   DISALLOW_COPY_AND_ASSIGN(Program);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_PROGRAM_BINDING_H_