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

Unified Diff: cc/output/renderer_pixeltest.cc

Issue 1869753003: Replace many skia::RefPtr with sk_sp<> in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fmalita review - deconstify sk_sp<>s Created 4 years, 8 months 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
Index: cc/output/renderer_pixeltest.cc
diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc
index e07513b26872a679642107efcd6928952c88dbed..49486696b563d71b7ea936bff5f1c70ec4f4caa1 100644
--- a/cc/output/renderer_pixeltest.cc
+++ b/cc/output/renderer_pixeltest.cc
@@ -1389,12 +1389,10 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlpha) {
matrix[13] = matrix[14] = 0;
matrix[15] = matrix[16] = matrix[17] = matrix[19] = 0;
matrix[18] = 1;
- sk_sp<SkColorFilter> color_filter =
- SkColorFilter::MakeMatrixFilterRowMajor255(matrix);
- skia::RefPtr<SkImageFilter> filter = skia::AdoptRef(
- SkColorFilterImageFilter::Create(color_filter.get(), NULL));
FilterOperations filters;
- filters.Append(FilterOperation::CreateReferenceFilter(filter));
+ filters.Append(
+ FilterOperation::CreateReferenceFilter(SkColorFilterImageFilter::Make(
+ SkColorFilter::MakeMatrixFilterRowMajor255(matrix), NULL)));
RenderPassDrawQuad* render_pass_quad =
root_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
@@ -1628,12 +1626,10 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlphaTranslation) {
matrix[14] = 1.5f;
matrix[15] = matrix[16] = matrix[17] = matrix[19] = 0;
matrix[18] = 1;
- sk_sp<SkColorFilter> color_filter =
- SkColorFilter::MakeMatrixFilterRowMajor255(matrix);
- skia::RefPtr<SkImageFilter> filter = skia::AdoptRef(
- SkColorFilterImageFilter::Create(color_filter.get(), NULL));
FilterOperations filters;
- filters.Append(FilterOperation::CreateReferenceFilter(filter));
+ filters.Append(
+ FilterOperation::CreateReferenceFilter(SkColorFilterImageFilter::Make(
+ SkColorFilter::MakeMatrixFilterRowMajor255(matrix), NULL)));
RenderPassDrawQuad* render_pass_quad =
root_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
@@ -2569,7 +2565,7 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadDisableImageFiltering) {
canvas->drawPoint(0, 1, SK_ColorBLUE);
canvas->drawPoint(1, 0, SK_ColorBLUE);
canvas->drawPoint(1, 1, SK_ColorGREEN);
- skia::RefPtr<SkImage> image = skia::AdoptRef(surface->newImageSnapshot());
+ sk_sp<SkImage> image = surface->makeImageSnapshot();
std::unique_ptr<FakeRecordingSource> recording =
FakeRecordingSource::CreateFilledRecordingSource(viewport.size());
@@ -2618,7 +2614,7 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadNearestNeighbor) {
canvas->drawPoint(0, 1, SK_ColorBLUE);
canvas->drawPoint(1, 0, SK_ColorBLUE);
canvas->drawPoint(1, 1, SK_ColorGREEN);
- skia::RefPtr<SkImage> image = skia::AdoptRef(surface->newImageSnapshot());
+ sk_sp<SkImage> image = surface->makeImageSnapshot();
std::unique_ptr<FakeRecordingSource> recording =
FakeRecordingSource::CreateFilledRecordingSource(viewport.size());

Powered by Google App Engine
This is Rietveld 408576698