Add shadow/corner radius to notifications (toasts and in-center).

ui/gfx/image/image_skia_operations.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/image/image_skia_operations.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 378 matching lines @@
     return ImageSkiaRep(shadow_bitmap, image_rep.scale());
   }
 
  private:
   const ImageSkia source_;
   const ShadowValues shadows_in_dip_;
 
   DISALLOW_COPY_AND_ASSIGN(DropShadowSource);
 };
 
-class ShadowNineboxSource : public CanvasImageSource {
- public:
-  ShadowNineboxSource(const std::vector<ShadowValue>& shadows,
-                      float corner_radius)
-      : CanvasImageSource(CalculateSize(shadows, corner_radius), false),
-        shadows_(shadows),
-        corner_radius_(corner_radius) {
-    DCHECK(!shadows.empty());
-  }
-  ~ShadowNineboxSource() override {}
-
-  // CanvasImageSource overrides:
-  void Draw(Canvas* canvas) override {
-    SkPaint paint;
-    paint.setLooper(CreateShadowDrawLooperCorrectBlur(shadows_));
-    Insets insets = -ShadowValue::GetMargin(shadows_);
-    gfx::Rect bounds(size());
-    bounds.Inset(insets);
-    SkRRect r_rect = SkRRect::MakeRectXY(gfx::RectToSkRect(bounds),
-                                         corner_radius_, corner_radius_);
-
-    // Clip out the center so it's not painted with the shadow.
-    canvas->sk_canvas()->clipRRect(r_rect, SkClipOp::kDifference, true);
-    // Clipping alone is not enough --- due to anti aliasing there will still be
-    // some of the fill color in the rounded corners. We must make the fill
-    // color transparent.
-    paint.setColor(SK_ColorTRANSPARENT);
-    canvas->sk_canvas()->drawRRect(r_rect, paint);
-  }
-
- private:
-  static Size CalculateSize(const std::vector<ShadowValue>& shadows,
-                            float corner_radius) {
-    // The "content" area (the middle tile in the 3x3 grid) is a single pixel.
-    gfx::Rect bounds(0, 0, 1, 1);
-    // We need enough space to render the full range of blur.
-    bounds.Inset(-ShadowValue::GetBlurRegion(shadows));
-    // We also need space for the full roundrect corner rounding.
-    bounds.Inset(-gfx::Insets(corner_radius));
-    return bounds.size();
-  }
-
-  const std::vector<ShadowValue> shadows_;
-
-  const float corner_radius_;
-
-  DISALLOW_COPY_AND_ASSIGN(ShadowNineboxSource);
-};
-
 // An image source that is 1px wide, suitable for tiling horizontally.
 class HorizontalShadowSource : public CanvasImageSource {
  public:
   HorizontalShadowSource(const std::vector<ShadowValue>& shadows,
                          bool fades_down)
       : CanvasImageSource(Size(1, GetHeightForShadows(shadows)), false),
         shadows_(shadows),
         fades_down_(fades_down) {}
   ~HorizontalShadowSource() override {}
 
@@ skipping 174 matching lines @@
     return ImageSkia();
 
   const gfx::Insets shadow_padding = -gfx::ShadowValue::GetMargin(shadows);
   gfx::Size shadow_image_size = source.size();
   shadow_image_size.Enlarge(shadow_padding.width(),
                             shadow_padding.height());
   return ImageSkia(new DropShadowSource(source, shadows), shadow_image_size);
 }
 
 // static
-ImageSkia ImageSkiaOperations::CreateShadowNinebox(const ShadowValues& shadows,
-                                                   float corner_radius) {
-  auto source = new ShadowNineboxSource(shadows, corner_radius);
-  return ImageSkia(source, source->size());
-}
-
-// static
 ImageSkia ImageSkiaOperations::CreateHorizontalShadow(
     const std::vector<ShadowValue>& shadows,
     bool fades_down) {
   auto source = new HorizontalShadowSource(shadows, fades_down);
   return ImageSkia(source, source->size());
 }
 
 // static
 ImageSkia ImageSkiaOperations::CreateRotatedImage(
       const ImageSkia& source,
@@ skipping 14 matching lines @@
   if (icon.isNull())
     return ImageSkia();
 
   if (badge.isNull())
     return icon;
 
   return ImageSkia(new IconWithBadgeSource(icon, badge), icon.size());
 }
 
 }  // namespace gfx