Update WM shadows for MD.

ui/gfx/shadow_value.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/shadow_value.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
 #include "base/strings/stringprintf.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/vector2d_conversions.h"
 
 namespace gfx {
 
+namespace {
+
+Insets GetInsets(const ShadowValues& shadows, bool include_inner_blur) {
+  int left = 0;
+  int top = 0;
+  int right = 0;
+  int bottom = 0;
+
+  for (size_t i = 0; i < shadows.size(); ++i) {
+    const ShadowValue& shadow = shadows[i];
+
+    // Add 0.5 to round up to the next integer.
+    int blur =

[James Cook, 2016/12/05 23:38:35]

nit: this might be clearer as

int blur = include_inner_blur
  ? shadow.blur() + 0.5
  : shadow.blur() / 2.0 + 0.5

Optionally dividing by 1 seems a bit weird to me.

[Evan Stade, 2016/12/06 00:53:21]

re-arranged

+        static_cast<int>(shadow.blur() / (include_inner_blur ? 1 : 2) + 0.5);

[James Cook, 2016/12/05 23:38:35]

optional: Style guide is now OK with int{blah} for numerical type conversions

[Evan Stade, 2016/12/06 00:53:21]

Done.

[Evan Stade, 2016/12/07 01:56:42]

Windows didn't like it --- cast from double to int requires a narrowing
conversion

+
+    left = std::max(left, blur - shadow.x());
+    top = std::max(top, blur - shadow.y());
+    right = std::max(right, blur + shadow.x());
+    bottom = std::max(bottom, blur + shadow.y());
+  }
+
+  return Insets(top, left, bottom, right);
+}
+}
+
 ShadowValue::ShadowValue()
     : blur_(0),
       color_(0) {
 }
 
 ShadowValue::ShadowValue(const gfx::Vector2d& offset,
                          double blur,
                          SkColor color)
     : offset_(offset), blur_(blur), color_(color) {
 }
@@ skipping 13 matching lines @@
       offset_.x(), offset_.y(),
       blur_,
       SkColorGetR(color_),
       SkColorGetG(color_),
       SkColorGetB(color_),
       SkColorGetA(color_));
 }
 
 // static
 Insets ShadowValue::GetMargin(const ShadowValues& shadows) {
-  int left = 0;
-  int top = 0;
-  int right = 0;
-  int bottom = 0;
+  gfx::Insets margins = GetInsets(shadows, false);
+  return -margins;
+}
 
-  for (size_t i = 0; i < shadows.size(); ++i) {
-    const ShadowValue& shadow = shadows[i];
-
-    // Add 0.5 to round up to the next integer.
-    int blur = static_cast<int>(shadow.blur() / 2 + 0.5);
-
-    left = std::max(left, blur - shadow.x());
-    top = std::max(top, blur - shadow.y());
-    right = std::max(right, blur + shadow.x());
-    bottom = std::max(bottom, blur + shadow.y());
-  }
-
-  return Insets(-top, -left, -bottom, -right);
+// static
+Insets ShadowValue::GetBlurRegion(const ShadowValues& shadows) {
+  return GetInsets(shadows, true);
 }
 
 }  // namespace gfx