cc: Add point-based UV coordinate on TextureLayer

cc/draw_quad_unittest.cc

 // Copyright 2012 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.
 
 #include "cc/draw_quad.h"
 
 #include "cc/checkerboard_draw_quad.h"
 #include "cc/debug_border_draw_quad.h"
 #include "cc/io_surface_draw_quad.h"
 #include "cc/math_util.h"
@@ skipping 344 matching lines @@
     EXPECT_EQ(DrawQuad::STREAM_VIDEO_CONTENT, copyQuad->material);
     EXPECT_EQ(textureId, copyQuad->texture_id);
     EXPECT_EQ(matrix, copyQuad->matrix);
 }
 
 TEST(DrawQuadTest, copyTextureDrawQuad)
 {
     gfx::Rect opaqueRect(3, 7, 10, 12);
     unsigned resourceId = 82;
     bool premultipliedAlpha = true;
-    gfx::RectF uvRect(0.5f, 224.f, 51.f, 36.f);
+    gfx::PointF uvTopLeft(0.5f, 224.f);
+    gfx::PointF uvBottomRight(51.5f, 260.f);
     const float vertex_opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
     bool flipped = true;
     CREATE_SHARED_STATE();
 
-    CREATE_QUAD_6_NEW(TextureDrawQuad, opaqueRect, resourceId, premultipliedAlpha, uvRect, vertex_opacity, flipped);
+    CREATE_QUAD_7_NEW(TextureDrawQuad, opaqueRect, resourceId, premultipliedAlpha, uvTopLeft, uvBottomRight, vertex_opacity, flipped);
     EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copyQuad->material);
     EXPECT_RECT_EQ(opaqueRect, copyQuad->opaque_rect);
     EXPECT_EQ(resourceId, copyQuad->resource_id);
     EXPECT_EQ(premultipliedAlpha, copyQuad->premultiplied_alpha);
-    EXPECT_FLOAT_RECT_EQ(uvRect, copyQuad->uv_rect);
+    EXPECT_EQ(uvTopLeft, copyQuad->uv_top_left);
+    EXPECT_EQ(uvBottomRight, copyQuad->uv_bottom_right);
     EXPECT_FLOAT_ARRAY_EQ(vertex_opacity, copyQuad->vertex_opacity, 4);
     EXPECT_EQ(flipped, copyQuad->flipped);
 
-    CREATE_QUAD_5_ALL(TextureDrawQuad, resourceId, premultipliedAlpha, uvRect, vertex_opacity, flipped);
+    CREATE_QUAD_6_ALL(TextureDrawQuad, resourceId, premultipliedAlpha, uvTopLeft, uvBottomRight, vertex_opacity, flipped);
     EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copyQuad->material);
     EXPECT_EQ(resourceId, copyQuad->resource_id);
     EXPECT_EQ(premultipliedAlpha, copyQuad->premultiplied_alpha);
-    EXPECT_FLOAT_RECT_EQ(uvRect, copyQuad->uv_rect);
+    EXPECT_EQ(uvTopLeft, copyQuad->uv_top_left);
+    EXPECT_EQ(uvBottomRight, copyQuad->uv_bottom_right);
     EXPECT_FLOAT_ARRAY_EQ(vertex_opacity, copyQuad->vertex_opacity, 4);
     EXPECT_EQ(flipped, copyQuad->flipped);
 }
 
+TEST(DrawQuadTest, clipTextureDrawQuad)
+{
+    gfx::Rect opaqueRect(3, 7, 10, 12);
+    unsigned resourceId = 82;
+    bool premultipliedAlpha = true;
+    gfx::PointF uvTopLeft(0.1f, 0.2f);
+    gfx::PointF uvBottomRight(0.9f, 0.8f);
+    const float vertexOpacity[] = {0.3f, 0.4f, 0.7f, 0.8f};
+    bool flipped = true;
+    CREATE_SHARED_STATE();
+    sharedState->content_to_target_transform = MathUtil::createGfxTransform(1.f, 0.f, 0.f, 1.f, 10.f, 20.f);
+    sharedState->clip_rect = gfx::Rect(50, 70, 30, 20);
+
+    {
+      CREATE_QUAD_7_NEW(TextureDrawQuad, opaqueRect, resourceId, premultipliedAlpha, uvTopLeft, uvBottomRight, vertexOpacity, flipped);
+      CREATE_QUAD_6_ALL(TextureDrawQuad, resourceId, premultipliedAlpha, uvTopLeft, uvBottomRight, vertexOpacity, flipped);
+      EXPECT_TRUE(quadAll->PerformClipping());
+
+      gfx::PointF uvTopLeftClipped(0.26f, 0.3f);

[danakj, 2013/01/15 01:48:42]

Can you add a comment here to justify these expected values? The more verbose
the better :)

[Jerome, 2013/01/15 17:58:12]

Done.

+      gfx::PointF uvBottomRightClipped(0.74f, 0.5f);
+      const float vertexOpacityClipped[] = {0.43f, 0.45f, 0.65f, 0.67f};
+
+      EXPECT_EQ(uvTopLeftClipped, quadAll->uv_top_left);
+      EXPECT_EQ(uvBottomRightClipped, quadAll->uv_bottom_right);
+      EXPECT_FLOAT_ARRAY_EQ(vertexOpacityClipped, quadAll->vertex_opacity, 4);
+    }
+
+    uvTopLeft = gfx::PointF(0.8f, 0.7f);
+    uvBottomRight = gfx::PointF(0.2f, 0.1f);
+
+    {
+      CREATE_QUAD_7_NEW(TextureDrawQuad, opaqueRect, resourceId, premultipliedAlpha, uvTopLeft, uvBottomRight, vertexOpacity, flipped);
+      CREATE_QUAD_6_ALL(TextureDrawQuad, resourceId, premultipliedAlpha, uvTopLeft, uvBottomRight, vertexOpacity, flipped);
+      EXPECT_TRUE(quadAll->PerformClipping());
+
+      gfx::PointF uvTopLeftClipped(0.68f, 0.6f);

[danakj, 2013/01/15 01:48:42]

same here

[Jerome, 2013/01/15 17:58:12]

Done.

+      gfx::PointF uvBottomRightClipped(0.32f, 0.4f);
+
+      EXPECT_EQ(uvTopLeftClipped, quadAll->uv_top_left);
+      EXPECT_EQ(uvBottomRightClipped, quadAll->uv_bottom_right);
+    }
+}
+
 TEST(DrawQuadTest, copyTileDrawQuad)
 {
     gfx::Rect opaqueRect(33, 44, 22, 33);
     unsigned resourceId = 104;
     gfx::RectF texCoordRect(31, 12, 54, 20);
     gfx::Size textureSize(85, 32);
     bool swizzleContents = true;
     bool leftEdgeAA = true;
     bool topEdgeAA = true;
     bool rightEdgeAA = false;
@@ skipping 65 matching lines @@
     EXPECT_EQ(uPlane.resourceId, copyQuad->u_plane.resourceId);
     EXPECT_EQ(uPlane.size, copyQuad->u_plane.size);
     EXPECT_EQ(uPlane.format, copyQuad->u_plane.format);
     EXPECT_EQ(vPlane.resourceId, copyQuad->v_plane.resourceId);
     EXPECT_EQ(vPlane.size, copyQuad->v_plane.size);
     EXPECT_EQ(vPlane.format, copyQuad->v_plane.format);
 }
 
 }  // namespace
 }  // namespace cc