cc: Support texture rect targets for masks

cc/output/gl_renderer_unittest.cc

Index: cc/output/gl_renderer_unittest.cc
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 42e4b5ea264553b2a15860c14114c98025139d5e..44d93ab6e9fecd41a740176717b4c443aee664f7 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -72,16 +72,10 @@ class GLRendererShaderPixelTest : public GLRendererPixelTest {
   void TestShadersWithTexCoordPrecision(TexCoordPrecision precision) {
     EXPECT_PROGRAM_VALID(renderer()->GetRenderPassProgram(precision));
     EXPECT_PROGRAM_VALID(renderer()->GetRenderPassProgramAA(precision));
-    EXPECT_PROGRAM_VALID(renderer()->GetRenderPassMaskProgram(precision));
-    EXPECT_PROGRAM_VALID(renderer()->GetRenderPassMaskProgramAA(precision));
     EXPECT_PROGRAM_VALID(
         renderer()->GetRenderPassColorMatrixProgram(precision));
     EXPECT_PROGRAM_VALID(
-        renderer()->GetRenderPassMaskColorMatrixProgramAA(precision));
-    EXPECT_PROGRAM_VALID(
         renderer()->GetRenderPassColorMatrixProgramAA(precision));
-    EXPECT_PROGRAM_VALID(
-        renderer()->GetRenderPassMaskColorMatrixProgram(precision));
     EXPECT_PROGRAM_VALID(renderer()->GetTextureProgram(precision));
     EXPECT_PROGRAM_VALID(
         renderer()->GetNonPremultipliedTextureProgram(precision));
@@ -113,6 +107,14 @@ class GLRendererShaderPixelTest : public GLRendererPixelTest {
         renderer()->GetTileProgramSwizzleOpaque(precision, sampler));
     EXPECT_PROGRAM_VALID(
         renderer()->GetTileProgramSwizzleAA(precision, sampler));
+    EXPECT_PROGRAM_VALID(
+        renderer()->GetRenderPassMaskProgram(precision, sampler));
+    EXPECT_PROGRAM_VALID(
+        renderer()->GetRenderPassMaskProgramAA(precision, sampler));
+    EXPECT_PROGRAM_VALID(
+        renderer()->GetRenderPassMaskColorMatrixProgramAA(precision, sampler));
+    EXPECT_PROGRAM_VALID(
+        renderer()->GetRenderPassMaskColorMatrixProgram(precision, sampler));
   }
 };
 
@@ -217,17 +219,22 @@ class GLRendererShaderTest : public GLRendererTest {
               renderer_->program_shadow_);
   }
 
-  void TestRenderPassMaskProgram(TexCoordPrecision precision) {
-    EXPECT_PROGRAM_VALID(&renderer_->render_pass_mask_program_[precision]);
-    EXPECT_EQ(renderer_->render_pass_mask_program_[precision].program(),
-              renderer_->program_shadow_);
+  void TestRenderPassMaskProgram(TexCoordPrecision precision,
+                                 SamplerType sampler) {
+    EXPECT_PROGRAM_VALID(
+        &renderer_->render_pass_mask_program_[precision][sampler]);
+    EXPECT_EQ(
+        renderer_->render_pass_mask_program_[precision][sampler].program(),
+        renderer_->program_shadow_);
   }
 
-  void TestRenderPassMaskColorMatrixProgram(TexCoordPrecision precision) {
+  void TestRenderPassMaskColorMatrixProgram(TexCoordPrecision precision,
+                                            SamplerType sampler) {
     EXPECT_PROGRAM_VALID(
-        &renderer_->render_pass_mask_color_matrix_program_[precision]);
+        &renderer_->render_pass_mask_color_matrix_program_[precision][sampler]);
     EXPECT_EQ(
-        renderer_->render_pass_mask_color_matrix_program_[precision].program(),
+        renderer_->render_pass_mask_color_matrix_program_[precision][sampler]
+            .program(),
         renderer_->program_shadow_);
   }
 
@@ -245,18 +252,24 @@ class GLRendererShaderTest : public GLRendererTest {
         renderer_->program_shadow_);
   }
 
-  void TestRenderPassMaskProgramAA(TexCoordPrecision precision) {
-    EXPECT_PROGRAM_VALID(&renderer_->render_pass_mask_program_aa_[precision]);
-    EXPECT_EQ(renderer_->render_pass_mask_program_aa_[precision].program(),
-              renderer_->program_shadow_);
+  void TestRenderPassMaskProgramAA(TexCoordPrecision precision,
+                                   SamplerType sampler) {
+    EXPECT_PROGRAM_VALID(
+        &renderer_->render_pass_mask_program_aa_[precision][sampler]);
+    EXPECT_EQ(
+        renderer_->render_pass_mask_program_aa_[precision][sampler].program(),
+        renderer_->program_shadow_);
   }
 
-  void TestRenderPassMaskColorMatrixProgramAA(TexCoordPrecision precision) {
+  void TestRenderPassMaskColorMatrixProgramAA(TexCoordPrecision precision,
+                                              SamplerType sampler) {
     EXPECT_PROGRAM_VALID(
-        &renderer_->render_pass_mask_color_matrix_program_aa_[precision]);
-    EXPECT_EQ(renderer_->render_pass_mask_color_matrix_program_aa_[precision]
-                  .program(),
-              renderer_->program_shadow_);
+        &renderer_
+             ->render_pass_mask_color_matrix_program_aa_[precision][sampler]);
+    EXPECT_EQ(
+        renderer_->render_pass_mask_color_matrix_program_aa_[precision][sampler]
+            .program(),
+        renderer_->program_shadow_);
   }
 
   void TestSolidColorProgramAA() {
@@ -1428,7 +1441,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
                        viewport_rect,
                        viewport_rect,
                        false);
-  TestRenderPassMaskProgram(TexCoordPrecisionMedium);
+  TestRenderPassMaskProgram(TexCoordPrecisionMedium, SamplerType2D);
 
   // RenderPassMaskColorMatrixProgram
   render_passes_in_draw_order_.clear();
@@ -1451,7 +1464,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
                        viewport_rect,
                        viewport_rect,
                        false);
-  TestRenderPassMaskColorMatrixProgram(TexCoordPrecisionMedium);
+  TestRenderPassMaskColorMatrixProgram(TexCoordPrecisionMedium, SamplerType2D);
 
   // RenderPassProgramAA
   render_passes_in_draw_order_.clear();
@@ -1522,7 +1535,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
                        viewport_rect,
                        viewport_rect,
                        false);
-  TestRenderPassMaskProgramAA(TexCoordPrecisionMedium);
+  TestRenderPassMaskProgramAA(TexCoordPrecisionMedium, SamplerType2D);
 
   // RenderPassMaskColorMatrixProgramAA
   render_passes_in_draw_order_.clear();
@@ -1545,7 +1558,8 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
                        viewport_rect,
                        viewport_rect,
                        false);
-  TestRenderPassMaskColorMatrixProgramAA(TexCoordPrecisionMedium);
+  TestRenderPassMaskColorMatrixProgramAA(TexCoordPrecisionMedium,
+                                         SamplerType2D);
 }
 
 // At this time, the AA code path cannot be taken if the surface's rect would