Use sk_sp-based shader creation APIs

cc/output/software_renderer.cc

 // Copyright 2012 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 "cc/output/software_renderer.h"
 
 #include "base/trace_event/trace_event.h"
 #include "cc/base/math_util.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
@@ skipping 487 matching lines @@
 
   skia::RefPtr<SkImage> filter_image;
   if (!quad->filters.IsEmpty()) {
     skia::RefPtr<SkImageFilter> filter = RenderSurfaceFilters::BuildImageFilter(
         quad->filters, gfx::SizeF(content_texture->size()));
     // TODO(ajuma): Apply the filter in the same pass as the content where
     // possible (e.g. when there's no origin offset). See crbug.com/308201.
     filter_image = ApplyImageFilter(filter.get(), quad, content);
   }
 
-  skia::RefPtr<SkShader> shader;
+  sk_sp<SkShader> shader;
   if (!filter_image) {
-    shader = skia::AdoptRef(
-        SkShader::CreateBitmapShader(*content, SkShader::kClamp_TileMode,
-                                     SkShader::kClamp_TileMode, &content_mat));
+    shader =
+        SkShader::MakeBitmapShader(*content, SkShader::kClamp_TileMode,
+                                   SkShader::kClamp_TileMode, &content_mat);
   } else {
-    shader = skia::AdoptRef(filter_image->newShader(
-        SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &content_mat));
+    shader = filter_image->makeShader(SkShader::kClamp_TileMode,
+                                      SkShader::kClamp_TileMode, &content_mat);
   }
 
   scoped_ptr<ResourceProvider::ScopedReadLockSoftware> mask_lock;
   if (quad->mask_resource_id()) {
     mask_lock = scoped_ptr<ResourceProvider::ScopedReadLockSoftware>(
         new ResourceProvider::ScopedReadLockSoftware(resource_provider_,
                                                      quad->mask_resource_id()));
 
     if (!mask_lock->valid())
       return;
@@ skipping 17 matching lines @@
     SkLayerRasterizer::Builder builder;
     builder.addLayer(mask_paint);
 
     skia::RefPtr<SkLayerRasterizer> mask_rasterizer =
         skia::AdoptRef(builder.detachRasterizer());
 
     current_paint_.setRasterizer(mask_rasterizer.get());
   }
 
   // If we have a background filter shader, render its results first.
-  skia::RefPtr<SkShader> background_filter_shader =
+  sk_sp<SkShader> background_filter_shader =
       GetBackgroundFilterShader(frame, quad, SkShader::kClamp_TileMode);
   if (background_filter_shader) {
     SkPaint paint;
-    paint.setShader(background_filter_shader.get());
+    paint.setShader(std::move(background_filter_shader));
     paint.setRasterizer(current_paint_.getRasterizer());
     current_canvas_->drawRect(dest_visible_rect, paint);
   }
-  current_paint_.setShader(shader.get());
+  current_paint_.setShader(std::move(shader));
   current_canvas_->drawRect(dest_visible_rect, current_paint_);
 }
 
 void SoftwareRenderer::DrawUnsupportedQuad(const DrawingFrame* frame,
                                            const DrawQuad* quad) {
 #ifdef NDEBUG
   current_paint_.setColor(SK_ColorWHITE);
 #else
   current_paint_.setColor(SK_ColorMAGENTA);
 #endif
@@ skipping 103 matching lines @@
   int top, right, bottom, left;
   quad->background_filters.GetOutsets(&top, &right, &bottom, &left);
   backdrop_rect.Inset(-left, -top, -right, -bottom);
 
   backdrop_rect.Intersect(MoveFromDrawToWindowSpace(
       frame, frame->current_render_pass->output_rect));
 
   return backdrop_rect;
 }
 
-skia::RefPtr<SkShader> SoftwareRenderer::GetBackgroundFilterShader(
+sk_sp<SkShader> SoftwareRenderer::GetBackgroundFilterShader(
     const DrawingFrame* frame,
     const RenderPassDrawQuad* quad,
     SkShader::TileMode content_tile_mode) const {
   if (!ShouldApplyBackgroundFilters(quad))
-    return skia::RefPtr<SkShader>();
+    return sk_sp<SkShader>();

[danakj, 2016/03/25 18:18:08]

can you just return nullptr? (sk_sp has a nullptr constructor i hope)

[f(malita), 2016/03/25 18:31:03]

+1

[tomhudson, 2016/03/25 19:27:31]

Done.

 
   gfx::Transform quad_rect_matrix;
   QuadRectTransform(&quad_rect_matrix,
                     quad->shared_quad_state->quad_to_target_transform,
                     gfx::RectF(quad->rect));
   gfx::Transform contents_device_transform =
       frame->window_matrix * frame->projection_matrix * quad_rect_matrix;
   contents_device_transform.FlattenTo2d();
 
   gfx::Rect backdrop_rect = GetBackdropBoundingBoxForRenderPassQuad(
       frame, quad, contents_device_transform);
 
   // Figure out the transformations to move it back to pixel space.
   gfx::Transform contents_device_transform_inverse;
   if (!contents_device_transform.GetInverse(&contents_device_transform_inverse))
-    return skia::RefPtr<SkShader>();
+    return sk_sp<SkShader>();

[danakj, 2016/03/25 18:18:08]

ditto

[tomhudson, 2016/03/25 19:27:31]

Done.

 
   SkMatrix filter_backdrop_transform =
       contents_device_transform_inverse.matrix();
   filter_backdrop_transform.preTranslate(backdrop_rect.x(), backdrop_rect.y());
 
   // Draw what's behind, and apply the filter to it.
   SkBitmap backdrop_bitmap = GetBackdropBitmap(backdrop_rect);
 
   skia::RefPtr<SkImageFilter> filter = RenderSurfaceFilters::BuildImageFilter(
       quad->background_filters,
       gfx::SizeF(backdrop_bitmap.width(), backdrop_bitmap.height()));
   skia::RefPtr<SkImage> filter_backdrop_image =
       ApplyImageFilter(filter.get(), quad, &backdrop_bitmap);
 
   if (!filter_backdrop_image)
     return nullptr;
 
-  return skia::AdoptRef(filter_backdrop_image->newShader(
-      content_tile_mode, content_tile_mode, &filter_backdrop_transform));
+  return filter_backdrop_image->makeShader(content_tile_mode, content_tile_mode,
+                                           &filter_backdrop_transform);
 }
 
 }  // namespace cc