Adjust shadow and stroke of MdTextButton.

ui/views/animation/ink_drop_painted_layer_delegates.cc

 // Copyright 2015 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/views/animation/ink_drop_painted_layer_delegates.h"
 
 #include "third_party/skia/include/core/SkDrawLooper.h"
 #include "third_party/skia/include/core/SkPaint.h"
+#include "third_party/skia/include/core/SkRRect.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/skia_util.h"
 
@@ skipping 106 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // BorderShadowLayerDelegate
 //
 
 BorderShadowLayerDelegate::BorderShadowLayerDelegate(
     const std::vector<gfx::ShadowValue>& shadows,
     const gfx::Rect& shadowed_area_bounds,
+    SkColor fill_color,
     int corner_radius)
     : BasePaintedLayerDelegate(gfx::kPlaceholderColor),
       shadows_(shadows),
       bounds_(shadowed_area_bounds),
+      fill_color_(fill_color),
       corner_radius_(corner_radius) {}
 
 BorderShadowLayerDelegate::~BorderShadowLayerDelegate() {}
 
 gfx::Rect BorderShadowLayerDelegate::GetPaintedBounds() const {
   gfx::Rect total_rect(bounds_);
   total_rect.Inset(gfx::ShadowValue::GetMargin(shadows_));
   return total_rect;
 }
 
 gfx::Vector2dF BorderShadowLayerDelegate::GetCenteringOffset() const {
   return gfx::RectF(bounds_).CenterPoint().OffsetFromOrigin();
 }
 
 void BorderShadowLayerDelegate::OnPaintLayer(const ui::PaintContext& context) {
   SkPaint paint;
-  paint.setLooper(gfx::CreateShadowDrawLooperCorrectBlur(shadows_));
   paint.setStyle(SkPaint::kFill_Style);
   paint.setAntiAlias(true);
-  paint.setColor(SK_ColorTRANSPARENT);
+  paint.setColor(fill_color_);
+
   gfx::RectF rrect_bounds =
       gfx::RectF(bounds_ - GetPaintedBounds().OffsetFromOrigin());
+  SkRRect r_rect = SkRRect::MakeRectXY(gfx::RectFToSkRect(rrect_bounds),
+                                       corner_radius_, corner_radius_);
 
+  // First the fill color.
   ui::PaintRecorder recorder(context, GetPaintedBounds().size());
-  recorder.canvas()->DrawRoundRect(rrect_bounds, corner_radius_, paint);
+  recorder.canvas()->sk_canvas()->drawRRect(r_rect, paint);
 
-  SkPaint clear_paint;
-  clear_paint.setAntiAlias(true);
-  clear_paint.setXfermodeMode(SkXfermode::kClear_Mode);
-  // If we don't care about actually clearing preexisting buffer content,
-  // this could be replaced with a kDifference clip for the draw above.
-  recorder.canvas()->DrawRoundRect(rrect_bounds, corner_radius_, clear_paint);
+  // Now the shadow.
+  paint.setLooper(gfx::CreateShadowDrawLooperCorrectBlur(shadows_));
+  recorder.canvas()->sk_canvas()->clipRRect(r_rect, SkRegion::kDifference_Op,
+                                            true);
+  recorder.canvas()->sk_canvas()->drawRRect(r_rect, paint);
 }
 
 }  // namespace views