Make ShadowBorder use ShadowValue.

ui/views/shadow_border.cc

Index: ui/views/shadow_border.cc
diff --git a/ui/views/shadow_border.cc b/ui/views/shadow_border.cc
index 3d5235cf84f690e479f9b9fd96b631299347dd41..49a8e301b70f11ac4d0da43885f11146fa83d163 100644
--- a/ui/views/shadow_border.cc
+++ b/ui/views/shadow_border.cc
@@ -7,7 +7,6 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/shadow_value.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/view.h"
 
@@ -17,40 +16,42 @@ ShadowBorder::ShadowBorder(int blur,
                            SkColor color,
                            int vertical_offset,
                            int horizontal_offset)
-    : views::Border(),
-      blur_(blur),
-      color_(color),
-      vertical_offset_(vertical_offset),
-      horizontal_offset_(horizontal_offset) {}
+    : ShadowBorder(
+          gfx::ShadowValue(gfx::Point(horizontal_offset, vertical_offset),
+                           blur,
+                           color)) {
+}
 
-ShadowBorder::~ShadowBorder() {}
+ShadowBorder::ShadowBorder(const gfx::ShadowValue& shadow)
+    : views::Border(), shadow_value_(shadow) {
+}
+
+ShadowBorder::~ShadowBorder() {
+}
 
 // TODO(sidharthms): Re-painting a shadow looper on every paint call may yield
 // poor performance. Ideally we should be caching the border to bitmaps.
 void ShadowBorder::Paint(const views::View& view, gfx::Canvas* canvas) {
   SkPaint paint;
   std::vector<gfx::ShadowValue> shadows;
-  shadows.push_back(gfx::ShadowValue(gfx::Point(), blur_, color_));
+  shadows.push_back(shadow_value_);
   skia::RefPtr<SkDrawLooper> looper = gfx::CreateShadowDrawLooper(shadows);
   paint.setLooper(looper.get());
   paint.setColor(SK_ColorTRANSPARENT);
   paint.setStrokeJoin(SkPaint::kRound_Join);
   gfx::Rect bounds(view.size());
-  // TODO(pkasting): This isn't right if one of the offsets is larger than
-  // (blur_ / 2).
-  bounds.Inset(gfx::Insets(blur_ / 2, blur_ / 2, blur_ / 2, blur_ / 2));
+  bounds.Inset(gfx::ShadowValue::GetMargin(shadows).Scale(-1));

[sky, 2015/02/05 17:33:32]

While this looks right did you make sure the new logic isn't going to cause
problems for existing code?

[calamity, 2015/02/06 05:29:53]

The only callers are the message center and app list and an image diff shows the
before and after to be pixel perfectly the same.

   canvas->DrawRect(bounds, paint);
 }
 
 gfx::Insets ShadowBorder::GetInsets() const {
-  return gfx::Insets(blur_ / 2 - vertical_offset_,
-                     blur_ / 2 - horizontal_offset_,
-                     blur_ / 2 + vertical_offset_,
-                     blur_ / 2 + horizontal_offset_);
+  std::vector<gfx::ShadowValue> shadows;
+  shadows.push_back(shadow_value_);
+  return -gfx::ShadowValue::GetMargin(shadows);

[sky, 2015/02/05 17:33:32]

Seems silly to do this all the time for something we know is never going to
change. How about caching the insets in the constructor?

[calamity, 2015/02/06 05:29:53]

Done.

 }
 
 gfx::Size ShadowBorder::GetMinimumSize() const {
-  return gfx::Size(blur_, blur_);
+  return gfx::Size(shadow_value_.blur(), shadow_value_.blur());
 }
 
 }  // namespace views