cc: Plumb more details about pixel refs to tile manager.

skia/ext/pixel_ref_utils_unittest.cc

 // Copyright 2014 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 "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/test/geometry_test_utils.h"
 #include "skia/ext/pixel_ref_utils.h"
 #include "skia/ext/refptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 165 matching lines @@
   SkPoint points[3];
   points[0].set(10, 10);
   points[1].set(100, 20);
   points[2].set(50, 100);
   // (10, 10, 90, 90).
   canvas->drawPoints(SkCanvas::kPolygon_PointMode, 3, points, first_paint);
 
   canvas->save();
 
   canvas->clipRect(SkRect::MakeWH(50, 50));
-  // (10, 10, 40, 40).
+  // (10, 10, 90, 90).
   canvas->drawPoints(SkCanvas::kPolygon_PointMode, 3, points, second_paint);
 
   canvas->restore();
 
   points[0].set(50, 55);
   points[1].set(50, 55);
   points[2].set(200, 200);
   // (50, 55, 150, 145).
   canvas->drawPoints(SkCanvas::kPolygon_PointMode, 3, points, third_paint);
 
   skia::RefPtr<SkPicture> picture =
       skia::AdoptRef(StopRecording(&recorder, canvas));
 
   std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs;
   skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs);
 
   EXPECT_EQ(3u, pixel_refs.size());
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(10, 10, 90, 90),
                        gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[0].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[0].filter_quality);
-  EXPECT_FLOAT_RECT_EQ(gfx::RectF(10, 10, 40, 40),
+  EXPECT_FLOAT_RECT_EQ(gfx::RectF(10, 10, 90, 90),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[1].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[1].filter_quality);
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(50, 55, 150, 145),
                        gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[2].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[2].filter_quality);
 }
 
 TEST(PixelRefUtilsTest, DrawRect) {
@@ skipping 20 matching lines @@
   canvas->save();
 
   canvas->translate(5, 17);
   // (5, 50, 25, 35)
   canvas->drawRect(SkRect::MakeXYWH(0, 33, 25, 35), second_paint);
 
   canvas->restore();
 
   canvas->clipRect(SkRect::MakeXYWH(50, 50, 50, 50));
   canvas->translate(20, 20);
-  // (50, 50, 50, 50)
+  // (20, 20, 100, 100)
   canvas->drawRect(SkRect::MakeXYWH(0, 0, 100, 100), third_paint);
 
   skia::RefPtr<SkPicture> picture =
       skia::AdoptRef(StopRecording(&recorder, canvas));
 
   std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs;
   skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs);
 
   EXPECT_EQ(3u, pixel_refs.size());
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(10, 20, 30, 40),
                        gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[0].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[0].filter_quality);
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(5, 50, 25, 35),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[1].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[1].filter_quality);
-  EXPECT_FLOAT_RECT_EQ(gfx::RectF(50, 50, 50, 50),
+  EXPECT_FLOAT_RECT_EQ(gfx::RectF(20, 20, 100, 100),
                        gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[2].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[2].filter_quality);
 }
 
 TEST(PixelRefUtilsTest, DrawRRect) {
   gfx::Rect layer_rect(0, 0, 256, 256);
 
   SkPictureRecorder recorder;
   SkCanvas* canvas = StartRecording(&recorder, layer_rect);
@@ skipping 21 matching lines @@
   canvas->translate(5, 17);
   rrect.setRect(SkRect::MakeXYWH(0, 33, 25, 35));
   // (5, 50, 25, 35)
   canvas->drawRRect(rrect, second_paint);
 
   canvas->restore();
 
   canvas->clipRect(SkRect::MakeXYWH(50, 50, 50, 50));
   canvas->translate(20, 20);
   rrect.setRect(SkRect::MakeXYWH(0, 0, 100, 100));
-  // (50, 50, 50, 50)
+  // (20, 20, 100, 100)
   canvas->drawRRect(rrect, third_paint);
 
   skia::RefPtr<SkPicture> picture =
       skia::AdoptRef(StopRecording(&recorder, canvas));
 
   std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs;
   skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs);
 
   EXPECT_EQ(3u, pixel_refs.size());
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(10, 20, 30, 40),
                        gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[0].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[0].filter_quality);
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(5, 50, 25, 35),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[1].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[1].filter_quality);
-  EXPECT_FLOAT_RECT_EQ(gfx::RectF(50, 50, 50, 50),
+  EXPECT_FLOAT_RECT_EQ(gfx::RectF(20, 20, 100, 100),
                        gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[2].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[2].filter_quality);
 }
 
 TEST(PixelRefUtilsTest, DrawOval) {
   gfx::Rect layer_rect(0, 0, 256, 256);
 
   SkPictureRecorder recorder;
   SkCanvas* canvas = StartRecording(&recorder, layer_rect);
@@ skipping 20 matching lines @@
   canvas->save();
 
   canvas->translate(1, 2);
   // (1, 35, 25, 35)
   canvas->drawRect(SkRect::MakeXYWH(0, 33, 25, 35), second_paint);
 
   canvas->restore();
 
   canvas->clipRect(SkRect::MakeXYWH(50, 50, 50, 50));
   canvas->translate(20, 20);
-  // (50, 50, 50, 50)
+  // (20, 20, 100, 100).
   canvas->drawRect(SkRect::MakeXYWH(0, 0, 100, 100), third_paint);
 
   skia::RefPtr<SkPicture> picture =
       skia::AdoptRef(StopRecording(&recorder, canvas));
 
   std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs;
   skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs);
 
   EXPECT_EQ(3u, pixel_refs.size());
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(20, 10, 60, 20),
                        gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect));
   VerifyScales(2.f, 0.5f, pixel_refs[0].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[0].filter_quality);
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(1, 35, 25, 35),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[1].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[1].filter_quality);
-  EXPECT_FLOAT_RECT_EQ(gfx::RectF(50, 50, 50, 50),
+  EXPECT_FLOAT_RECT_EQ(gfx::RectF(20, 20, 100, 100),
                        gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[2].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[2].filter_quality);
 }
 
 TEST(PixelRefUtilsTest, DrawPath) {
   gfx::Rect layer_rect(0, 0, 256, 256);
 
   SkPictureRecorder recorder;
   SkCanvas* canvas = StartRecording(&recorder, layer_rect);
@@ skipping 10 matching lines @@
   path.moveTo(12, 13);
   path.lineTo(50, 50);
   path.lineTo(22, 101);
 
   // (12, 13, 38, 88).
   canvas->drawPath(path, first_paint);
 
   canvas->save();
   canvas->clipRect(SkRect::MakeWH(50, 50));
 
-  // (12, 13, 38, 37).
+  // (12, 13, 38, 88), since clips are ignored as long as the shape is in the
+  // clip.
   canvas->drawPath(path, second_paint);
 
   canvas->restore();
 
   skia::RefPtr<SkPicture> picture =
       skia::AdoptRef(StopRecording(&recorder, canvas));
 
   std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs;
   skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs);
 
   EXPECT_EQ(2u, pixel_refs.size());
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(12, 13, 38, 88),
                        gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[0].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[0].filter_quality);
-  EXPECT_FLOAT_RECT_EQ(gfx::RectF(12, 13, 38, 37),
+  EXPECT_FLOAT_RECT_EQ(gfx::RectF(12, 13, 38, 88),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[1].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[1].filter_quality);
 }
 
 TEST(PixelRefUtilsTest, DrawBitmap) {
   gfx::Rect layer_rect(0, 0, 256, 256);
 
   SkPictureRecorder recorder;
   SkCanvas* canvas = StartRecording(&recorder, layer_rect);
@@ skipping 66 matching lines @@
   VerifyScales(1.f, 1.f, pixel_refs[2].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[2].filter_quality);
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(0, 0, 1, 50),
                        gfx::SkRectToRectF(pixel_refs[3].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[3].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[3].filter_quality);
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(0, 0, 50, 60),
                        gfx::SkRectToRectF(pixel_refs[4].pixel_ref_rect));
   VerifyScales(5.f, 6.f, pixel_refs[4].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[4].filter_quality);
-  EXPECT_FLOAT_RECT_EQ(gfx::RectF(0, 0, 29.403214f, 18.545712f),
+  EXPECT_FLOAT_RECT_EQ(gfx::RectF(-1.8159621f, 0, 31.219175f, 18.545712f),
                        gfx::SkRectToRectF(pixel_refs[5].pixel_ref_rect));
   VerifyScales(3.3f, 0.4f, pixel_refs[5].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[5].filter_quality);
 }
 
 TEST(PixelRefUtilsTest, DrawBitmapRect) {
   gfx::Rect layer_rect(0, 0, 256, 256);
 
   SkPictureRecorder recorder;
   SkCanvas* canvas = StartRecording(&recorder, layer_rect);
@@ skipping 199 matching lines @@
                        points,
                        colors,
                        NULL,
                        indecies,
                        3,
                        first_paint);
 
   canvas->save();
 
   canvas->clipRect(SkRect::MakeWH(50, 50));
-  // (10, 10, 40, 40).
+  // (10, 10, 90, 90), since clips are ignored as long as the draw object is
+  // within clip.
   canvas->drawVertices(SkCanvas::kTriangles_VertexMode,
                        3,
                        points,
                        points,
                        colors,
                        NULL,
                        indecies,
                        3,
                        second_paint);
 
@@ skipping 17 matching lines @@
       skia::AdoptRef(StopRecording(&recorder, canvas));
 
   std::vector<skia::PixelRefUtils::PositionPixelRef> pixel_refs;
   skia::PixelRefUtils::GatherDiscardablePixelRefs(picture.get(), &pixel_refs);
 
   EXPECT_EQ(3u, pixel_refs.size());
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(10, 10, 90, 90),
                        gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[0].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[0].filter_quality);
-  EXPECT_FLOAT_RECT_EQ(gfx::RectF(10, 10, 40, 40),
+  EXPECT_FLOAT_RECT_EQ(gfx::RectF(10, 10, 90, 90),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[1].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[1].filter_quality);
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(50, 55, 150, 145),
                        gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect));
   VerifyScales(1.f, 1.f, pixel_refs[2].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[2].filter_quality);
 }
 
 }  // namespace skia