Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/playback/display_item_list_unittest.cc

Issue 2509983004: Revert "Change call-sites now that SkCanvas is not ref-counted" (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/playback/discardable_image_map.cc ('k') | cc/raster/gpu_raster_buffer_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/playback/display_item_list_unittest.cc
diff --git a/cc/playback/display_item_list_unittest.cc b/cc/playback/display_item_list_unittest.cc
index 9bbc5d92fe7834be8582bd8ca5ec88a4b0bb7570..bcee1202839aa52e23f20aa1963908fcbb60f775 100644
--- a/cc/playback/display_item_list_unittest.cc
+++ b/cc/playback/display_item_list_unittest.cc
@@ -52,7 +52,9 @@ scoped_refptr<DisplayItemList> CreateDefaultList() {
sk_sp<const SkPicture> CreateRectPicture(const gfx::Rect& bounds) {
SkPictureRecorder recorder;
- SkCanvas* canvas = recorder.beginRecording(bounds.width(), bounds.height());
+ sk_sp<SkCanvas> canvas;
+
+ canvas = sk_ref_sp(recorder.beginRecording(bounds.width(), bounds.height()));
canvas->drawRect(
SkRect::MakeXYWH(bounds.x(), bounds.y(), bounds.width(), bounds.height()),
SkPaint());
@@ -63,12 +65,13 @@ void AppendFirstSerializationTestPicture(scoped_refptr<DisplayItemList> list,
const gfx::Size& layer_size) {
gfx::PointF offset(2.f, 3.f);
SkPictureRecorder recorder;
+ sk_sp<SkCanvas> canvas;
SkPaint red_paint;
red_paint.setColor(SK_ColorRED);
- SkCanvas* canvas = recorder.beginRecording(SkRect::MakeXYWH(
- offset.x(), offset.y(), layer_size.width(), layer_size.height()));
+ canvas = sk_ref_sp(recorder.beginRecording(SkRect::MakeXYWH(
+ offset.x(), offset.y(), layer_size.width(), layer_size.height())));
canvas->translate(offset.x(), offset.y());
canvas->drawRectCoords(0.f, 0.f, 4.f, 4.f, red_paint);
list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
@@ -79,12 +82,13 @@ void AppendSecondSerializationTestPicture(scoped_refptr<DisplayItemList> list,
const gfx::Size& layer_size) {
gfx::PointF offset(2.f, 2.f);
SkPictureRecorder recorder;
+ sk_sp<SkCanvas> canvas;
SkPaint blue_paint;
blue_paint.setColor(SK_ColorBLUE);
- SkCanvas* canvas = recorder.beginRecording(SkRect::MakeXYWH(
- offset.x(), offset.y(), layer_size.width(), layer_size.height()));
+ canvas = sk_ref_sp(recorder.beginRecording(SkRect::MakeXYWH(
+ offset.x(), offset.y(), layer_size.width(), layer_size.height())));
canvas->translate(offset.x(), offset.y());
canvas->drawRectCoords(3.f, 3.f, 7.f, 7.f, blue_paint);
list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
@@ -291,6 +295,7 @@ TEST(DisplayItemListTest, SerializeTransformItem) {
TEST(DisplayItemListTest, SingleDrawingItem) {
gfx::Rect layer_rect(100, 100);
SkPictureRecorder recorder;
+ sk_sp<SkCanvas> canvas;
SkPaint blue_paint;
blue_paint.setColor(SK_ColorBLUE);
SkPaint red_paint;
@@ -302,8 +307,8 @@ TEST(DisplayItemListTest, SingleDrawingItem) {
gfx::PointF offset(8.f, 9.f);
gfx::RectF recording_rect(offset, gfx::SizeF(layer_rect.size()));
- SkCanvas* canvas =
- recorder.beginRecording(gfx::RectFToSkRect(recording_rect));
+ canvas =
+ sk_ref_sp(recorder.beginRecording(gfx::RectFToSkRect(recording_rect)));
canvas->translate(offset.x(), offset.y());
canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint);
@@ -332,6 +337,7 @@ TEST(DisplayItemListTest, SingleDrawingItem) {
TEST(DisplayItemListTest, ClipItem) {
gfx::Rect layer_rect(100, 100);
SkPictureRecorder recorder;
+ sk_sp<SkCanvas> canvas;
SkPaint blue_paint;
blue_paint.setColor(SK_ColorBLUE);
SkPaint red_paint;
@@ -343,8 +349,8 @@ TEST(DisplayItemListTest, ClipItem) {
gfx::PointF first_offset(8.f, 9.f);
gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size()));
- SkCanvas* canvas =
- recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect));
+ canvas = sk_ref_sp(
+ recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect)));
canvas->translate(first_offset.x(), first_offset.y());
canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
@@ -357,7 +363,8 @@ TEST(DisplayItemListTest, ClipItem) {
gfx::PointF second_offset(2.f, 3.f);
gfx::RectF second_recording_rect(second_offset,
gfx::SizeF(layer_rect.size()));
- canvas = recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect));
+ canvas = sk_ref_sp(
+ recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect)));
canvas->translate(second_offset.x(), second_offset.y());
canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint);
list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
@@ -389,6 +396,7 @@ TEST(DisplayItemListTest, ClipItem) {
TEST(DisplayItemListTest, TransformItem) {
gfx::Rect layer_rect(100, 100);
SkPictureRecorder recorder;
+ sk_sp<SkCanvas> canvas;
SkPaint blue_paint;
blue_paint.setColor(SK_ColorBLUE);
SkPaint red_paint;
@@ -400,8 +408,8 @@ TEST(DisplayItemListTest, TransformItem) {
gfx::PointF first_offset(8.f, 9.f);
gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size()));
- SkCanvas* canvas =
- recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect));
+ canvas = sk_ref_sp(
+ recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect)));
canvas->translate(first_offset.x(), first_offset.y());
canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
@@ -414,7 +422,8 @@ TEST(DisplayItemListTest, TransformItem) {
gfx::PointF second_offset(2.f, 3.f);
gfx::RectF second_recording_rect(second_offset,
gfx::SizeF(layer_rect.size()));
- canvas = recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect));
+ canvas = sk_ref_sp(
+ recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect)));
canvas->translate(second_offset.x(), second_offset.y());
canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint);
list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
@@ -476,12 +485,13 @@ TEST(DisplayItemListTest, FilterItem) {
// Include a rect drawing so that filter is actually applied to something.
{
SkPictureRecorder recorder;
+ sk_sp<SkCanvas> canvas;
SkPaint red_paint;
red_paint.setColor(SK_ColorRED);
- SkCanvas* canvas = recorder.beginRecording(
- SkRect::MakeXYWH(0, 0, layer_rect.width(), layer_rect.height()));
+ canvas = sk_ref_sp(recorder.beginRecording(
+ SkRect::MakeXYWH(0, 0, layer_rect.width(), layer_rect.height())));
canvas->drawRectCoords(filter_bounds.x(), filter_bounds.y(),
filter_bounds.right(), filter_bounds.bottom(),
red_paint);
@@ -510,6 +520,7 @@ TEST(DisplayItemListTest, FilterItem) {
TEST(DisplayItemListTest, CompactingItems) {
gfx::Rect layer_rect(100, 100);
SkPictureRecorder recorder;
+ sk_sp<SkCanvas> canvas;
SkPaint blue_paint;
blue_paint.setColor(SK_ColorBLUE);
SkPaint red_paint;
@@ -523,8 +534,8 @@ TEST(DisplayItemListTest, CompactingItems) {
scoped_refptr<DisplayItemList> list_without_caching =
DisplayItemList::Create(no_caching_settings);
- SkCanvas* canvas =
- recorder.beginRecording(gfx::RectFToSkRect(recording_rect));
+ canvas =
+ sk_ref_sp(recorder.beginRecording(gfx::RectFToSkRect(recording_rect)));
canvas->translate(offset.x(), offset.y());
canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint);
« no previous file with comments | « cc/playback/discardable_image_map.cc ('k') | cc/raster/gpu_raster_buffer_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698