ui/gfx: use SkLayerDrawLooper::Builder::addLayerOnTop instead of addLayer

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 "base/containers/adapters.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkUnPreMultiply.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/effects/SkLayerDrawLooper.h"
 #include "ui/gfx/geometry/quad_f.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
@@ skipping 102 matching lines @@
   return radius > 0 ? SkDoubleToScalar(0.57735f * radius + 0.5) : 0;
 }
 
 skia::RefPtr<SkDrawLooper> CreateShadowDrawLooper(
     const std::vector<ShadowValue>& shadows) {
   if (shadows.empty())
     return skia::RefPtr<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];
-
+  for (const ShadowValue& shadow : base::Reversed(shadows)) {
     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));
 
-    SkPaint* paint = looper_builder.addLayer(layer_info);
+    SkPaint* paint = looper_builder.addLayerOnTop(layer_info);
     paint->setMaskFilter(blur_mask.get());
     paint->setColorFilter(color_filter.get());
   }
 
+  // Top layer of the original.
+  looper_builder.addLayerOnTop(SkLayerDrawLooper::LayerInfo());
+
   return skia::AdoptRef<SkDrawLooper>(looper_builder.detachLooper());
 }
 
 bool BitmapsAreEqual(const SkBitmap& bitmap1, const SkBitmap& bitmap2) {
   void* addr1 = NULL;
   void* addr2 = NULL;
   size_t size1 = 0;
   size_t size2 = 0;
 
   bitmap1.lockPixels();
@@ skipping 34 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