cc/output/render_surface_filters.cc - Issue 1869753003: Replace many skia::RefPtr with sk_sp<> in cc/

Unified Diff: cc/output/render_surface_filters.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: rebase 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/render_surface_filters.cc

diff --git a/cc/output/render_surface_filters.cc b/cc/output/render_surface_filters.cc

index de3c7fc7ec43dbd9e83bf263e2144d2a437b0a04..fdbf80bded30a47bf33f530455d5535e9921f877 100644

--- a/cc/output/render_surface_filters.cc

+++ b/cc/output/render_surface_filters.cc

@@ -10,7 +10,6 @@

#include "cc/output/filter_operation.h"

#include "cc/output/filter_operations.h"

-#include "skia/ext/refptr.h"

#include "third_party/skia/include/core/SkImageFilter.h"

#include "third_party/skia/include/effects/SkAlphaThresholdFilter.h"

#include "third_party/skia/include/effects/SkBlurImageFilter.h"

@@ -145,21 +144,21 @@ void GetSepiaMatrix(float amount, SkScalar matrix[20]) {

matrix[18] = 1.f;

}

-skia::RefPtr<SkImageFilter> CreateMatrixImageFilter(

+sk_sp<SkImageFilter> CreateMatrixImageFilter(

const SkScalar matrix[20],

- const skia::RefPtr<SkImageFilter>& input) {

+ const sk_sp<SkImageFilter>& input) {

danakj 2016/04/14 19:37:32 by value

tomhudson 2016/04/25 20:48:11 Done.

sk_sp<SkColorFilter> color_filter =

SkColorFilter::MakeMatrixFilterRowMajor255(matrix);

- return skia::AdoptRef(

+ return sk_sp<SkImageFilter>(

danakj 2016/04/14 19:37:32 call Make and you don't need to cast/wrap here

tomhudson 2016/04/25 20:48:11 Done. (Some of those Make() calls on filters were

SkColorFilterImageFilter::Create(color_filter.get(), input.get()));

}

} // namespace

-skia::RefPtr<SkImageFilter> RenderSurfaceFilters::BuildImageFilter(

+sk_sp<SkImageFilter> RenderSurfaceFilters::BuildImageFilter(

const FilterOperations& filters,

const gfx::SizeF& size) {

- skia::RefPtr<SkImageFilter> image_filter;

+ sk_sp<SkImageFilter> image_filter;

SkScalar matrix[20];

for (size_t i = 0; i < filters.size(); ++i) {

const FilterOperation& op = filters.at(i);

@@ -197,15 +196,14 @@ skia::RefPtr<SkImageFilter> RenderSurfaceFilters::BuildImageFilter(

image_filter = CreateMatrixImageFilter(matrix, image_filter);

break;

case FilterOperation::BLUR:

- image_filter = skia::AdoptRef(SkBlurImageFilter::Create(

- op.amount(), op.amount(), image_filter.get()));

+ image_filter =

+ SkBlurImageFilter::Make(op.amount(), op.amount(), image_filter);

break;

case FilterOperation::DROP_SHADOW:

- image_filter = skia::AdoptRef(SkDropShadowImageFilter::Create(

+ image_filter = sk_sp<SkImageFilter>(SkDropShadowImageFilter::Create(

danakj 2016/04/14 19:37:31 call Make instead?

tomhudson 2016/04/25 20:48:11 Done.

SkIntToScalar(op.drop_shadow_offset().x()),

SkIntToScalar(op.drop_shadow_offset().y()),

- SkIntToScalar(op.amount()),

+ SkIntToScalar(op.amount()), SkIntToScalar(op.amount()),

op.drop_shadow_color(),

SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode,

image_filter.get()));

@@ -214,20 +212,17 @@ skia::RefPtr<SkImageFilter> RenderSurfaceFilters::BuildImageFilter(

image_filter = CreateMatrixImageFilter(op.matrix(), image_filter);

break;

case FilterOperation::ZOOM: {

- skia::RefPtr<SkImageFilter> zoom_filter =

- skia::AdoptRef(SkMagnifierImageFilter::Create(

- SkRect::MakeXYWH(

- (size.width() - (size.width() / op.amount())) / 2.f,

- (size.height() - (size.height() / op.amount())) / 2.f,

- size.width() / op.amount(),

- size.height() / op.amount()),

- op.zoom_inset()));

+ sk_sp<SkImageFilter> zoom_filter(SkMagnifierImageFilter::Create(

+ SkRect::MakeXYWH(

+ (size.width() - (size.width() / op.amount())) / 2.f,

+ (size.height() - (size.height() / op.amount())) / 2.f,

+ size.width() / op.amount(), size.height() / op.amount()),

+ op.zoom_inset()));

if (image_filter.get()) {

// TODO(ajuma): When there's a 1-input version of

// SkMagnifierImageFilter, use that to handle the input filter

// instead of using an SkComposeImageFilter.

- image_filter = skia::AdoptRef(SkComposeImageFilter::Create(

- zoom_filter.get(), image_filter.get()));

+ image_filter = SkComposeImageFilter::Make(zoom_filter, image_filter);

danakj 2016/04/14 19:37:32 move zoom_filter too

tomhudson 2016/04/25 20:48:11 Done.

} else {

image_filter = zoom_filter;

}

@@ -241,32 +236,30 @@ skia::RefPtr<SkImageFilter> RenderSurfaceFilters::BuildImageFilter(

if (!op.image_filter())

break;

- skia::RefPtr<SkColorFilter> cf;

+ sk_sp<SkColorFilter> cf;

{

SkColorFilter* colorfilter_rawptr = NULL;

op.image_filter()->asColorFilter(&colorfilter_rawptr);

- cf = skia::AdoptRef(colorfilter_rawptr);

+ cf = sk_sp<SkColorFilter>(colorfilter_rawptr);

danakj 2016/04/14 19:37:32 cf.reset(

tomhudson 2016/04/25 20:48:11 Done.

}

if (cf && cf->asColorMatrix(matrix) &&

!op.image_filter()->getInput(0)) {

image_filter = CreateMatrixImageFilter(matrix, image_filter);

danakj 2016/04/14 19:37:31 move image_filter

tomhudson 2016/04/25 20:48:11 Done.

} else if (image_filter) {

- image_filter = skia::AdoptRef(SkComposeImageFilter::Create(

- op.image_filter().get(), image_filter.get()));

+ image_filter =

+ SkComposeImageFilter::Make(op.image_filter(), image_filter);

danakj 2016/04/14 19:37:32 move image_filter

tomhudson 2016/04/25 20:48:11 Done.

} else {

image_filter = op.image_filter();

}

break;

}

case FilterOperation::ALPHA_THRESHOLD: {

- skia::RefPtr<SkImageFilter> alpha_filter = skia::AdoptRef(

- SkAlphaThresholdFilter::Create(

- op.region(), op.amount(), op.outer_threshold()));

+ sk_sp<SkImageFilter> alpha_filter = SkAlphaThresholdFilter::Make(

+ op.region(), op.amount(), op.outer_threshold(), nullptr);

if (image_filter.get()) {

- image_filter = skia::AdoptRef(SkComposeImageFilter::Create(

- alpha_filter.get(), image_filter.get()));

+ image_filter = SkComposeImageFilter::Make(alpha_filter, image_filter);

danakj 2016/04/14 19:37:32 move alpha_filter

tomhudson 2016/04/25 20:48:13 Done.

} else {

image_filter = alpha_filter;

danakj 2016/04/14 19:37:32 move

tomhudson 2016/04/25 20:48:11 Done.

}

« cc/output/gl_renderer_unittest.cc ('K') | « cc/output/render_surface_filters.h ('k') | cc/output/renderer_pixeltest.cc » ('j') | cc/output/renderer_pixeltest.cc » ('J')