Add detection for rotation and flip overlay transforms

Rotations and flips were listed in the enum, but not being allowed by
OverlayCandidate::GetOverlayTransform.

BUG=

Review URL: https://codereview.chromium.org/1135813005

Cr-Commit-Position: refs/heads/master@{#329719}

3 files changed, 16 insertions, 16 deletions

diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc
index 02d57ba..968a1d0 100644
--- a/cc/quads/draw_quad_unittest.cc
+++ b/cc/quads/draw_quad_unittest.cc
@@ -549,7 +549,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
   gfx::PointF uv_top_left(0.5f, 224.f);
   gfx::PointF uv_bottom_right(51.5f, 260.f);
   const float vertex_opacity[] = { 1.0f, 1.0f, 1.0f, 1.0f };
-  bool flipped = true;
+  bool y_flipped = true;
   bool nearest_neighbor = true;
   CREATE_SHARED_STATE();
 
@@ -562,7 +562,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
                      uv_bottom_right,
                      SK_ColorTRANSPARENT,
                      vertex_opacity,
-                     flipped,
+                     y_flipped,
                      nearest_neighbor);
   EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copy_quad->material);
   EXPECT_EQ(visible_rect, copy_quad->visible_rect);
@@ -572,7 +572,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
   EXPECT_EQ(uv_top_left, copy_quad->uv_top_left);
   EXPECT_EQ(uv_bottom_right, copy_quad->uv_bottom_right);
   EXPECT_FLOAT_ARRAY_EQ(vertex_opacity, copy_quad->vertex_opacity, 4);
-  EXPECT_EQ(flipped, copy_quad->flipped);
+  EXPECT_EQ(y_flipped, copy_quad->y_flipped);
   EXPECT_EQ(nearest_neighbor, copy_quad->nearest_neighbor);
 
   CREATE_QUAD_8_ALL(TextureDrawQuad,
@@ -582,7 +582,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
                     uv_bottom_right,
                     SK_ColorTRANSPARENT,
                     vertex_opacity,
-                    flipped,
+                    y_flipped,
                     nearest_neighbor);
   EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copy_quad->material);
   EXPECT_EQ(resource_id, copy_quad->resource_id);
@@ -590,7 +590,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
   EXPECT_EQ(uv_top_left, copy_quad->uv_top_left);
   EXPECT_EQ(uv_bottom_right, copy_quad->uv_bottom_right);
   EXPECT_FLOAT_ARRAY_EQ(vertex_opacity, copy_quad->vertex_opacity, 4);
-  EXPECT_EQ(flipped, copy_quad->flipped);
+  EXPECT_EQ(y_flipped, copy_quad->y_flipped);
   EXPECT_EQ(nearest_neighbor, copy_quad->nearest_neighbor);
 }
 
@@ -857,7 +857,7 @@ TEST_F(DrawQuadIteratorTest, TextureDrawQuad) {
   gfx::PointF uv_top_left(0.5f, 224.f);
   gfx::PointF uv_bottom_right(51.5f, 260.f);
   const float vertex_opacity[] = { 1.0f, 1.0f, 1.0f, 1.0f };
-  bool flipped = true;
+  bool y_flipped = true;
   bool nearest_neighbor = true;
 
   CREATE_SHARED_STATE();
@@ -870,7 +870,7 @@ TEST_F(DrawQuadIteratorTest, TextureDrawQuad) {
                      uv_bottom_right,
                      SK_ColorTRANSPARENT,
                      vertex_opacity,
-                     flipped,
+                     y_flipped,
                      nearest_neighbor);
   EXPECT_EQ(resource_id, quad_new->resource_id);
   EXPECT_EQ(1, IterateAndCount(quad_new));
diff --git a/cc/quads/texture_draw_quad.cc b/cc/quads/texture_draw_quad.cc
index 318d4f8..4b8720a 100644
--- a/cc/quads/texture_draw_quad.cc
+++ b/cc/quads/texture_draw_quad.cc
@@ -16,7 +16,7 @@ TextureDrawQuad::TextureDrawQuad()
     : resource_id(0),
       premultiplied_alpha(false),
       background_color(SK_ColorTRANSPARENT),
-      flipped(false),
+      y_flipped(false),
       nearest_neighbor(false) {
   this->vertex_opacity[0] = 0.f;
   this->vertex_opacity[1] = 0.f;
@@ -34,7 +34,7 @@ void TextureDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
                              const gfx::PointF& uv_bottom_right,
                              SkColor background_color,
                              const float vertex_opacity[4],
-                             bool flipped,
+                             bool y_flipped,
                              bool nearest_neighbor) {
   bool needs_blending = vertex_opacity[0] != 1.0f || vertex_opacity[1] != 1.0f
       || vertex_opacity[2] != 1.0f || vertex_opacity[3] != 1.0f;
@@ -49,7 +49,7 @@ void TextureDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
   this->vertex_opacity[1] = vertex_opacity[1];
   this->vertex_opacity[2] = vertex_opacity[2];
   this->vertex_opacity[3] = vertex_opacity[3];
-  this->flipped = flipped;
+  this->y_flipped = y_flipped;
   this->nearest_neighbor = nearest_neighbor;
 }
 
@@ -64,7 +64,7 @@ void TextureDrawQuad::SetAll(const SharedQuadState* shared_quad_state,
                              const gfx::PointF& uv_bottom_right,
                              SkColor background_color,
                              const float vertex_opacity[4],
-                             bool flipped,
+                             bool y_flipped,
                              bool nearest_neighbor) {
   DrawQuad::SetAll(shared_quad_state, DrawQuad::TEXTURE_CONTENT, rect,
                    opaque_rect, visible_rect, needs_blending);
@@ -77,7 +77,7 @@ void TextureDrawQuad::SetAll(const SharedQuadState* shared_quad_state,
   this->vertex_opacity[1] = vertex_opacity[1];
   this->vertex_opacity[2] = vertex_opacity[2];
   this->vertex_opacity[3] = vertex_opacity[3];
-  this->flipped = flipped;
+  this->y_flipped = y_flipped;
   this->nearest_neighbor = nearest_neighbor;
 }
 
@@ -105,7 +105,7 @@ void TextureDrawQuad::ExtendValue(base::trace_event::TracedValue* value) const {
     value->AppendDouble(vertex_opacity[i]);
   value->EndArray();
 
-  value->SetBoolean("flipped", flipped);
+  value->SetBoolean("y_flipped", y_flipped);
   value->SetBoolean("nearest_neighbor", nearest_neighbor);
 }
 
diff --git a/cc/quads/texture_draw_quad.h b/cc/quads/texture_draw_quad.h
index afac6bf..7064149 100644
--- a/cc/quads/texture_draw_quad.h
+++ b/cc/quads/texture_draw_quad.h
@@ -26,7 +26,7 @@ class CC_EXPORT TextureDrawQuad : public DrawQuad {
               const gfx::PointF& uv_bottom_right,
               SkColor background_color,
               const float vertex_opacity[4],
-              bool flipped,
+              bool y_flipped,
               bool nearest_neighbor);
 
   void SetAll(const SharedQuadState* shared_quad_state,
@@ -40,7 +40,7 @@ class CC_EXPORT TextureDrawQuad : public DrawQuad {
               const gfx::PointF& uv_bottom_right,
               SkColor background_color,
               const float vertex_opacity[4],
-              bool flipped,
+              bool y_flipped,
               bool nearest_neighbor);
 
   unsigned resource_id;
@@ -49,7 +49,7 @@ class CC_EXPORT TextureDrawQuad : public DrawQuad {
   gfx::PointF uv_bottom_right;
   SkColor background_color;
   float vertex_opacity[4];
-  bool flipped;
+  bool y_flipped;
   bool nearest_neighbor;
 
   void IterateResources(const ResourceIteratorCallback& callback) override;