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

cc/output/gl_renderer.h

Index: cc/output/gl_renderer.h
diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
index ad7439694ad0dff076561660838bee2655b2ad23..dc3160a67a51db9931e50b79f6db531e0abf229b 100644
--- a/cc/output/gl_renderer.h
+++ b/cc/output/gl_renderer.h
@@ -336,9 +336,11 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
                                                     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,
@@ -348,9 +350,11 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
       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(
@@ -399,18 +403,18 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
   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];