Update from chromium https://crrev.com/302282

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 "base/cancelable_callback.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_deque.h"
@@ skipping 318 matching lines @@
       TexCoordPrecision precision, SamplerType sampler);
 
   const TileCheckerboardProgram* GetTileCheckerboardProgram();
 
   const RenderPassProgram* GetRenderPassProgram(TexCoordPrecision precision,
                                                 BlendMode blend_mode);
   const RenderPassProgramAA* GetRenderPassProgramAA(TexCoordPrecision precision,
                                                     BlendMode blend_mode);
   const RenderPassMaskProgram* GetRenderPassMaskProgram(
       TexCoordPrecision precision,
+      SamplerType sampler,
       BlendMode blend_mode);
   const RenderPassMaskProgramAA* GetRenderPassMaskProgramAA(
       TexCoordPrecision precision,
+      SamplerType sampler,
       BlendMode blend_mode);
   const RenderPassColorMatrixProgram* GetRenderPassColorMatrixProgram(
       TexCoordPrecision precision,
       BlendMode blend_mode);
   const RenderPassColorMatrixProgramAA* GetRenderPassColorMatrixProgramAA(
       TexCoordPrecision precision,
       BlendMode blend_mode);
   const RenderPassMaskColorMatrixProgram* GetRenderPassMaskColorMatrixProgram(
       TexCoordPrecision precision,
+      SamplerType sampler,
       BlendMode blend_mode);
   const RenderPassMaskColorMatrixProgramAA*
   GetRenderPassMaskColorMatrixProgramAA(TexCoordPrecision precision,
+                                        SamplerType sampler,
                                         BlendMode blend_mode);
 
   const TextureProgram* GetTextureProgram(
       TexCoordPrecision precision);
   const NonPremultipliedTextureProgram* GetNonPremultipliedTextureProgram(
       TexCoordPrecision precision);
   const TextureBackgroundProgram* GetTextureBackgroundProgram(
       TexCoordPrecision precision);
   const NonPremultipliedTextureBackgroundProgram*
       GetNonPremultipliedTextureBackgroundProgram(TexCoordPrecision precision);
@@ skipping 28 matching lines @@
   NonPremultipliedTextureProgram
       nonpremultiplied_texture_program_[NumTexCoordPrecisions];
   TextureBackgroundProgram texture_background_program_[NumTexCoordPrecisions];
   NonPremultipliedTextureBackgroundProgram
       nonpremultiplied_texture_background_program_[NumTexCoordPrecisions];
   TextureProgram texture_io_surface_program_[NumTexCoordPrecisions];
 
   RenderPassProgram render_pass_program_[NumTexCoordPrecisions][NumBlendModes];
   RenderPassProgramAA
       render_pass_program_aa_[NumTexCoordPrecisions][NumBlendModes];
-  RenderPassMaskProgram
-      render_pass_mask_program_[NumTexCoordPrecisions][NumBlendModes];
-  RenderPassMaskProgramAA
-      render_pass_mask_program_aa_[NumTexCoordPrecisions][NumBlendModes];
+  RenderPassMaskProgram render_pass_mask_program_
+      [NumTexCoordPrecisions][NumSamplerTypes][NumBlendModes];
+  RenderPassMaskProgramAA render_pass_mask_program_aa_
+      [NumTexCoordPrecisions][NumSamplerTypes][NumBlendModes];
   RenderPassColorMatrixProgram
       render_pass_color_matrix_program_[NumTexCoordPrecisions][NumBlendModes];
   RenderPassColorMatrixProgramAA render_pass_color_matrix_program_aa_
       [NumTexCoordPrecisions][NumBlendModes];
   RenderPassMaskColorMatrixProgram render_pass_mask_color_matrix_program_
-      [NumTexCoordPrecisions][NumBlendModes];
+      [NumTexCoordPrecisions][NumSamplerTypes][NumBlendModes];
   RenderPassMaskColorMatrixProgramAA render_pass_mask_color_matrix_program_aa_
-      [NumTexCoordPrecisions][NumBlendModes];
+      [NumTexCoordPrecisions][NumSamplerTypes][NumBlendModes];
 
   VideoYUVProgram video_yuv_program_[NumTexCoordPrecisions];
   VideoYUVAProgram video_yuva_program_[NumTexCoordPrecisions];
   VideoStreamTextureProgram
       video_stream_texture_program_[NumTexCoordPrecisions];
 
   DebugBorderProgram debug_border_program_;
   SolidColorProgram solid_color_program_;
   SolidColorProgramAA solid_color_program_aa_;
 
@@ skipping 43 matching lines @@
 #if DEBUG_GL_CALLS && !defined(NDEBUG)
 #define GLC(context, x)                                                        \
   (x, GLRenderer::DebugGLCall(&* context, #x, __FILE__, __LINE__))
 #else
 #define GLC(context, x) (x)
 #endif
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_GL_RENDERER_H_