cc: Support texture rect targets for masks

cc/trees/layer_tree_host_pixeltest_masks.cc

Index: cc/trees/layer_tree_host_pixeltest_masks.cc
diff --git a/cc/trees/layer_tree_host_pixeltest_masks.cc b/cc/trees/layer_tree_host_pixeltest_masks.cc
index 1b60eaea3252ae8d9d8b124bc36cac9d70683a7e..9e33c8c474eb1d9889ec7ae580bc90ab46907212 100644
--- a/cc/trees/layer_tree_host_pixeltest_masks.cc
+++ b/cc/trees/layer_tree_host_pixeltest_masks.cc
@@ -15,7 +15,21 @@
 namespace cc {
 namespace {
 
-class LayerTreeHostMasksPixelTest : public LayerTreePixelTest {};
+class LayerTreeHostMasksPixelTest : public LayerTreePixelTest,
+                                    public ::testing::WithParamInterface<
+                                        LayerTreeSettings::TextureTargetPrefs> {
+ public:
+  void InitializeSettings(LayerTreeSettings* settings) override {
+    settings->texture_target_prefs = GetParam();
+    LayerTreePixelTest::InitializeSettings(settings);
+  }
+};
+
+INSTANTIATE_TEST_CASE_P(
+    MaskTests,
+    LayerTreeHostMasksPixelTest,
+    ::testing::Values(LayerTreeSettings::FORCE_TEXTURE_2D_TARGET,
+                      LayerTreeSettings::FORCE_TEXTURE_RECT_TARGET));

[reveman, 2014/10/22 12:40:39]

We should be testing EXTERNAL_OES target too.

 
 class MaskContentLayerClient : public ContentLayerClient {
  public:
@@ -51,7 +65,7 @@ class MaskContentLayerClient : public ContentLayerClient {
   gfx::Size bounds_;
 };
 
-TEST_F(LayerTreeHostMasksPixelTest, MaskOfLayer) {
+TEST_P(LayerTreeHostMasksPixelTest, MaskOfLayer) {
   scoped_refptr<SolidColorLayer> background = CreateSolidColorLayer(
       gfx::Rect(200, 200), SK_ColorWHITE);
 
@@ -72,7 +86,7 @@ TEST_F(LayerTreeHostMasksPixelTest, MaskOfLayer) {
                base::FilePath(FILE_PATH_LITERAL("mask_of_layer.png")));
 }
 
-TEST_F(LayerTreeHostMasksPixelTest, ImageMaskOfLayer) {
+TEST_P(LayerTreeHostMasksPixelTest, ImageMaskOfLayer) {
   scoped_refptr<SolidColorLayer> background = CreateSolidColorLayer(
       gfx::Rect(200, 200), SK_ColorWHITE);
 
@@ -103,7 +117,7 @@ TEST_F(LayerTreeHostMasksPixelTest, ImageMaskOfLayer) {
                base::FilePath(FILE_PATH_LITERAL("image_mask_of_layer.png")));
 }
 
-TEST_F(LayerTreeHostMasksPixelTest, MaskOfClippedLayer) {
+TEST_P(LayerTreeHostMasksPixelTest, MaskOfClippedLayer) {
   scoped_refptr<SolidColorLayer> background = CreateSolidColorLayer(
       gfx::Rect(200, 200), SK_ColorWHITE);
 
@@ -131,7 +145,7 @@ TEST_F(LayerTreeHostMasksPixelTest, MaskOfClippedLayer) {
                base::FilePath(FILE_PATH_LITERAL("mask_of_clipped_layer.png")));
 }
 
-TEST_F(LayerTreeHostMasksPixelTest, MaskWithReplica) {
+TEST_P(LayerTreeHostMasksPixelTest, MaskWithReplica) {
   scoped_refptr<SolidColorLayer> background = CreateSolidColorLayer(
       gfx::Rect(200, 200), SK_ColorWHITE);
 
@@ -161,7 +175,7 @@ TEST_F(LayerTreeHostMasksPixelTest, MaskWithReplica) {
                base::FilePath(FILE_PATH_LITERAL("mask_with_replica.png")));
 }
 
-TEST_F(LayerTreeHostMasksPixelTest, MaskWithReplicaOfClippedLayer) {
+TEST_P(LayerTreeHostMasksPixelTest, MaskWithReplicaOfClippedLayer) {
   scoped_refptr<SolidColorLayer> background = CreateSolidColorLayer(
       gfx::Rect(200, 200), SK_ColorWHITE);
 
@@ -200,7 +214,7 @@ TEST_F(LayerTreeHostMasksPixelTest, MaskWithReplicaOfClippedLayer) {
                    "mask_with_replica_of_clipped_layer.png")));
 }
 
-TEST_F(LayerTreeHostMasksPixelTest, MaskOfReplica) {
+TEST_P(LayerTreeHostMasksPixelTest, MaskOfReplica) {
   scoped_refptr<SolidColorLayer> background = CreateSolidColorLayer(
       gfx::Rect(200, 200), SK_ColorWHITE);
 
@@ -235,7 +249,7 @@ TEST_F(LayerTreeHostMasksPixelTest, MaskOfReplica) {
                base::FilePath(FILE_PATH_LITERAL("mask_of_replica.png")));
 }
 
-TEST_F(LayerTreeHostMasksPixelTest, MaskOfReplicaOfClippedLayer) {
+TEST_P(LayerTreeHostMasksPixelTest, MaskOfReplicaOfClippedLayer) {
   scoped_refptr<SolidColorLayer> background = CreateSolidColorLayer(
       gfx::Rect(200, 200), SK_ColorWHITE);