Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

ui/gfx/skia_util.cc

 // Copyright (c) 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 "ui/gfx/skia_util.h"
 
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkBlurTypes.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
@@ skipping 53 matching lines @@
   flattened->set(1, SkMScalarToScalar(transform.matrix().get(0, 1)));
   flattened->set(2, SkMScalarToScalar(transform.matrix().get(0, 3)));
   flattened->set(3, SkMScalarToScalar(transform.matrix().get(1, 0)));
   flattened->set(4, SkMScalarToScalar(transform.matrix().get(1, 1)));
   flattened->set(5, SkMScalarToScalar(transform.matrix().get(1, 3)));
   flattened->set(6, SkMScalarToScalar(transform.matrix().get(3, 0)));
   flattened->set(7, SkMScalarToScalar(transform.matrix().get(3, 1)));
   flattened->set(8, SkMScalarToScalar(transform.matrix().get(3, 3)));
 }
 
-skia::RefPtr<SkShader> CreateGradientShader(int start_point,
-                                            int end_point,
-                                            SkColor start_color,
-                                            SkColor end_color) {
+sk_sp<SkShader> CreateGradientShader(int start_point,
+                                     int end_point,
+                                     SkColor start_color,
+                                     SkColor end_color) {
   SkColor grad_colors[2] = { start_color, end_color};
   SkPoint grad_points[2];
   grad_points[0].iset(0, start_point);
   grad_points[1].iset(0, end_point);
 
-  return skia::AdoptRef(SkGradientShader::CreateLinear(
-      grad_points, grad_colors, NULL, 2, SkShader::kRepeat_TileMode));
+  return SkGradientShader::MakeLinear(grad_points, grad_colors, NULL, 2,
+                                      SkShader::kRepeat_TileMode);
 }
 
 static SkScalar RadiusToSigma(double radius) {
   // This captures historically what skia did under the hood. Now skia accepts
   // sigma, not radius, so we perform the conversion.
   return radius > 0 ? SkDoubleToScalar(0.57735f * radius + 0.5) : 0;
 }
 
-skia::RefPtr<SkDrawLooper> CreateShadowDrawLooper(
+sk_sp<SkDrawLooper> CreateShadowDrawLooper(
     const std::vector<ShadowValue>& shadows) {
   if (shadows.empty())
-    return skia::RefPtr<SkDrawLooper>();
+    return sk_sp<SkDrawLooper>();
 
   SkLayerDrawLooper::Builder looper_builder;
 
   looper_builder.addLayer();  // top layer of the original.
 
   SkLayerDrawLooper::LayerInfo layer_info;
   layer_info.fPaintBits |= SkLayerDrawLooper::kMaskFilter_Bit;
   layer_info.fPaintBits |= SkLayerDrawLooper::kColorFilter_Bit;
   layer_info.fColorMode = SkXfermode::kSrc_Mode;
 
   for (size_t i = 0; i < shadows.size(); ++i) {
     const ShadowValue& shadow = shadows[i];
 
     layer_info.fOffset.set(SkIntToScalar(shadow.x()),
                            SkIntToScalar(shadow.y()));
 
     // SkBlurMaskFilter's blur radius defines the range to extend the blur from
     // original mask, which is half of blur amount as defined in ShadowValue.
-    skia::RefPtr<SkMaskFilter> blur_mask =
-        skia::AdoptRef(SkBlurMaskFilter::Create(
-            kNormal_SkBlurStyle, RadiusToSigma(shadow.blur() / 2),
-            SkBlurMaskFilter::kHighQuality_BlurFlag));
-    skia::RefPtr<SkColorFilter> color_filter =
-        skia::AdoptRef(SkColorFilter::CreateModeFilter(
-            shadow.color(), SkXfermode::kSrcIn_Mode));
+    sk_sp<SkMaskFilter> blur_mask = SkBlurMaskFilter::Make(
+        kNormal_SkBlurStyle, RadiusToSigma(shadow.blur() / 2),
+        SkBlurMaskFilter::kHighQuality_BlurFlag);
+    sk_sp<SkColorFilter> color_filter =
+        SkColorFilter::MakeModeFilter(shadow.color(), SkXfermode::kSrcIn_Mode);
 
     SkPaint* paint = looper_builder.addLayer(layer_info);
-    paint->setMaskFilter(blur_mask.get());
-    paint->setColorFilter(color_filter.get());
+    paint->setMaskFilter(blur_mask);
+    paint->setColorFilter(color_filter);
   }
 
-  return skia::AdoptRef<SkDrawLooper>(looper_builder.detachLooper());
+  return looper_builder.detach();
 }
 
 bool BitmapsAreEqual(const SkBitmap& bitmap1, const SkBitmap& bitmap2) {
   void* addr1 = NULL;
   void* addr2 = NULL;
   size_t size1 = 0;
   size_t size2 = 0;
 
   bitmap1.lockPixels();
   addr1 = bitmap1.getAddr32(0, 0);
@@ skipping 33 matching lines @@
 }
 
 void QuadFToSkPoints(const gfx::QuadF& quad, SkPoint points[4]) {
   points[0] = SkPoint::Make(quad.p1().x(), quad.p1().y());
   points[1] = SkPoint::Make(quad.p2().x(), quad.p2().y());
   points[2] = SkPoint::Make(quad.p3().x(), quad.p3().y());
   points[3] = SkPoint::Make(quad.p4().x(), quad.p4().y());
 }
 
 }  // namespace gfx