Update LocationBarView Background

chrome/browser/ui/views/location_bar/background_with_1_px_border.cc

Index: chrome/browser/ui/views/location_bar/background_with_1_px_border.cc
diff --git a/chrome/browser/ui/views/location_bar/background_with_1_px_border.cc b/chrome/browser/ui/views/location_bar/background_with_1_px_border.cc
new file mode 100644
index 0000000000000000000000000000000000000000..35e7f42877f5364b84f9702d8e91ada574701179
--- /dev/null
+++ b/chrome/browser/ui/views/location_bar/background_with_1_px_border.cc
@@ -0,0 +1,62 @@
+// 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 "chrome/browser/ui/views/location_bar/background_with_1_px_border.h"
+
+#include "third_party/skia/include/core/SkPaint.h"
+#include "third_party/skia/include/core/SkPath.h"
+#include "third_party/skia/include/pathops/SkPathOps.h"
+#include "ui/gfx/canvas.h"
+#include "ui/views/view.h"
+#include "ui/views/widget/widget.h"
+
+BackgroundWith1PxBorder::BackgroundWith1PxBorder(SkColor background,
+                                                 SkColor border,
+                                                 bool round_corners)
+    : border_color_(border), round_corners_(round_corners) {
+  SetNativeControlColor(background);
+}
+
+void BackgroundWith1PxBorder::Paint(gfx::Canvas* canvas,
+                                    views::View* view) const {
+  const float scale = canvas->SaveAndUnscale();

[Peter Kasting, 2015/10/30 21:07:14]

Note: You'll need to update this to compile against Dana's latest changes.  (Use
a ScopedCanvas, then call UndoDeviceScaleFactor().)

[jonross, 2015/11/02 16:36:23]

Done.

+  const float kPreScaleOffset = 1.0f;

[Peter Kasting, 2015/10/30 21:07:14]

Nit: Since you added LOCATION_BAR_EDGE_THICKNESS, this should probably use that
instead of hardcoding the same value.

[jonross, 2015/11/02 16:36:23]

Done.

+  const float kPostScaleOffset = -0.5f;
+  gfx::RectF border_rect_f(view->GetContentsBounds());
+  SkPath path;
+  if (round_corners_) {
+    border_rect_f.Inset(kPreScaleOffset, kPreScaleOffset);
+    border_rect_f.Scale(scale);
+    border_rect_f.Inset(kPostScaleOffset, kPostScaleOffset);
+    const SkScalar kCornerRadius = SkDoubleToScalar(2.5f * scale);
+    path.addRoundRect(gfx::RectFToSkRect(border_rect_f), kCornerRadius,
+                      kCornerRadius);
+  } else {
+    if (view->GetWidget()->IsMaximized())

[Peter Kasting, 2015/10/30 21:07:14]

Please add comments describing why we're doing this, e.g. by copying them over
from the location bar code.

I'm still a bit concerned that this behavior is more "specific to the popup
location bar" than "specific to rounding corners".  To me, it would be clearer
to make the class arg/member be "is popup mode" or "is the popup mode location
bar" rather than "round corners"; that matches how the location bar thinks about
this, and it makes it clearer that the distinction is more than just rounding
corners, it's about generally doing the border how popups want it.

That will also make it obvious that if we use this for other things than the
location bar (e.g. the bubbles inside it), and we for some reason decided to not
round their corners, that it wouldn't be appropriate to just flip the flag on
this class.

[jonross, 2015/11/02 16:36:22]

Switched over the naming to make it more consistent with the implementation. It
now tracks is_popup_mode_

+      border_rect_f.Inset(0.0f, kPreScaleOffset);
+    else
+      border_rect_f.Inset(kPreScaleOffset, kPreScaleOffset);

[Peter Kasting, 2015/10/30 21:07:14]

Nit: Simpler:

  border_rect_f.Inset(view->GetWidget()->IsMaximized() ? 0 : kPreScaleOffset,
                      kPreScaleOffset);

[jonross, 2015/11/02 16:36:23]

Done.

+    border_rect_f.Scale(scale);
+    border_rect_f.Inset(kPostScaleOffset, kPostScaleOffset);
+    path.addRect(gfx::RectFToSkRect(border_rect_f));
+  }
+
+  SkPaint paint;
+  paint.setStyle(SkPaint::kStroke_Style);
+  paint.setStrokeWidth(1);
+  paint.setAntiAlias(true);
+
+  SkPath stroke_path;
+  paint.getFillPath(path, &stroke_path);
+
+  SkPath fill_path;
+  Op(path, stroke_path, kDifference_SkPathOp, &fill_path);
+  paint.setStyle(SkPaint::kFill_Style);
+  paint.setColor(get_color());
+  canvas->sk_canvas()->drawPath(fill_path, paint);
+
+  paint.setColor(border_color_);
+  canvas->sk_canvas()->drawPath(stroke_path, paint);
+  canvas->Restore();
+}