Use SkPictureRecorder::endRecordingAsPicture() instead of endRecording()

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 67 matching lines @@
   canvas->save();
   canvas->translate(-layer_rect.x(), -layer_rect.y());
   canvas->clipRect(SkRect::MakeXYWH(
       layer_rect.x(), layer_rect.y(), layer_rect.width(), layer_rect.height()));
 
   return canvas;
 }
 
 SkPicture* StopRecording(SkPictureRecorder* recorder, SkCanvas* canvas) {
   canvas->restore();
-  return recorder->endRecording();
+  return recorder->endRecordingAsPicture();
 }
 
 }  // namespace
 
 TEST(PixelRefUtilsTest, DrawPaint) {
   gfx::Rect layer_rect(0, 0, 256, 256);
 
   SkPictureRecorder recorder;
   SkCanvas* canvas = StartRecording(&recorder, layer_rect);
 
   TestDiscardableShader first_shader;
   SkPaint first_paint;
   first_paint.setShader(&first_shader);
 
   TestDiscardableShader second_shader;
   SkPaint second_paint;
   second_paint.setShader(&second_shader);
 
   TestDiscardableShader third_shader;
   SkPaint third_paint;
   third_paint.setShader(&third_shader);
 
   canvas->drawPaint(first_paint);
   canvas->clipRect(SkRect::MakeXYWH(34, 45, 56, 67));
   canvas->drawPaint(second_paint);
   // Total clip is now (34, 45, 56, 55)
   canvas->clipRect(SkRect::MakeWH(100, 100));
   canvas->drawPaint(third_paint);
 
-  skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas));
+  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(0, 0, 256, 256),
                        gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(34, 45, 56, 67),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(34, 45, 56, 55),
@@ skipping 32 matching lines @@
   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));
+  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));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(10, 10, 40, 40),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(50, 55, 150, 145),
@@ skipping 27 matching lines @@
   // (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)
   canvas->drawRect(SkRect::MakeXYWH(0, 0, 100, 100), third_paint);
 
-  skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas));
+  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));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(5, 50, 25, 35),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(50, 50, 50, 50),
@@ skipping 32 matching lines @@
   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)
   canvas->drawRRect(rrect, third_paint);
 
-  skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas));
+  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));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(5, 50, 25, 35),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(50, 50, 50, 50),
@@ skipping 31 matching lines @@
   // (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)
   canvas->drawRect(SkRect::MakeXYWH(0, 0, 100, 100), third_paint);
 
-  skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas));
+  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));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(1, 35, 25, 35),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(50, 50, 50, 50),
@@ skipping 23 matching lines @@
   canvas->drawPath(path, first_paint);
 
   canvas->save();
   canvas->clipRect(SkRect::MakeWH(50, 50));
 
   // (12, 13, 38, 37).
   canvas->drawPath(path, second_paint);
 
   canvas->restore();
 
-  skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas));
+  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));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(12, 13, 38, 37),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
 }
@@ skipping 33 matching lines @@
   canvas->rotate(90);
   // At (1, 0), rotated 90 degrees
   canvas->drawBitmap(fourth, 0, 0);
 
   canvas->restore();
 
   canvas->scale(5, 6);
   // At (0, 0), scaled by 5 and 6
   canvas->drawBitmap(fifth, 0, 0);
 
-  skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas));
+  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(5u, pixel_refs.size());
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(0, 0, 50, 50),
                        gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(25, 0, 50, 50),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(50, 50, 50, 50),
                        gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(0, 0, 1, 50),
                        gfx::SkRectToRectF(pixel_refs[3].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(0, 0, 50, 60),
                        gfx::SkRectToRectF(pixel_refs[4].pixel_ref_rect));
-
 }
 
 TEST(PixelRefUtilsTest, DrawBitmapRect) {
   gfx::Rect layer_rect(0, 0, 256, 256);
 
   SkPictureRecorder recorder;
   SkCanvas* canvas = StartRecording(&recorder, layer_rect);
 
   SkBitmap first;
   CreateBitmap(gfx::Size(50, 50), "discardable", &first);
@@ skipping 17 matching lines @@
   // (75, 50, 10, 10).
   canvas->drawBitmapRect(
       second, SkRect::MakeXYWH(50, 50, 10, 10), &non_discardable_paint);
   canvas->translate(5, 50);
   // (0, 30, 100, 100). One from bitmap, one from paint.
   canvas->drawBitmapRect(
       third, SkRect::MakeXYWH(-30, -20, 100, 100), &first_paint);
 
   canvas->restore();
 
-  skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas));
+  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(4u, pixel_refs.size());
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(0, 0, 100, 100),
                        gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(75, 50, 10, 10),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(0, 30, 100, 100),
@@ skipping 42 matching lines @@
   canvas->restore();
 
   TestDiscardableShader first_shader;
   SkPaint first_paint;
   first_paint.setShader(&first_shader);
 
   canvas->scale(5, 6);
   // (100, 100, 50, 50).
   canvas->drawSprite(fifth, 100, 100, &first_paint);
 
-  skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas));
+  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(6u, pixel_refs.size());
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(0, 0, 50, 50),
                        gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(10, 0, 50, 50),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(25, 0, 50, 50),
@@ skipping 26 matching lines @@
   path.moveTo(10, 50);
   path.lineTo(20, 50);
   path.lineTo(30, 50);
   path.lineTo(40, 50);
   path.lineTo(50, 50);
 
   canvas->drawText("text", 4, 50, 50, first_paint);
   canvas->drawPosText("text", 4, points, first_paint);
   canvas->drawTextOnPath("text", 4, path, NULL, first_paint);
 
-  skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas));
+  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());
 }
 
 TEST(PixelRefUtilsTest, DrawVertices) {
   gfx::Rect layer_rect(0, 0, 256, 256);
 
@@ skipping 52 matching lines @@
   canvas->drawVertices(SkCanvas::kTriangles_VertexMode,
                        3,
                        points,
                        points,
                        colors,
                        NULL,
                        indecies,
                        3,
                        third_paint);
 
-  skia::RefPtr<SkPicture> picture = skia::AdoptRef(StopRecording(&recorder, canvas));
+  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));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(10, 10, 40, 40),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(50, 55, 150, 145),
                        gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect));
 }
 
 }  // namespace skia