MacViews: Anchor bubbles according to the MD spec.

ui/views/bubble/bubble_border.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/views/bubble/bubble_border.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
@@ skipping 204 matching lines @@
   if (UseMd() &&
       (arrow_ == TOP_RIGHT || arrow_ == TOP_LEFT || arrow_ == BOTTOM_CENTER ||
        arrow_ == LEFT_CENTER || arrow_ == RIGHT_CENTER)) {
     gfx::Rect contents_bounds(contents_size);
     // Apply the border part of the inset before calculating coordinates because
     // the border should align with the anchor's border. For the purposes of
     // positioning, the border is rounded up to a dip, which may mean we have
     // misalignment in scale factors greater than 1.
     // TODO(estade): when it becomes possible to provide px bounds instead of
     // dip bounds, fix this.
-    const gfx::Insets border_insets = gfx::Insets(kBorderThicknessDip);
+    const gfx::Insets border_insets =
+        shadow_ == NO_ASSETS ? gfx::Insets() : gfx::Insets(kBorderThicknessDip);

[Elly Fong-Jones, 2016/11/29 22:25:35]

what's up with this?

[tapted, 2016/11/29 23:06:41]

This is needed to get the alignment right - With UseMd() the `NO_ASSETS` border
type was still adding borders. I fixed most of it in r434069, but the stuff here
was throwing off the alignment slightly. r434069 ensured that the border wasn't
painted for NO_ASSETS, but the size shouldn't be adjusted here assiming there is
always a border.

In theory the GetInsets() on the line below should have taken care of it (it
already has an early exit for NO_ASSETS which was added in r434069). However,
the `border` local variable there was dead/unused -- I think it needs the
separate treatment here to deal with HiDPI stuff anyway.

     const gfx::Insets shadow_insets = GetInsets() - border_insets;
     contents_bounds.Inset(-border_insets);
     if (arrow_ == TOP_RIGHT) {
       contents_bounds +=
           anchor_rect.bottom_right() - contents_bounds.top_right();
     } else if (arrow_ == TOP_LEFT) {
       contents_bounds +=
           anchor_rect.bottom_left() - contents_bounds.origin();
     } else if (arrow_ == BOTTOM_CENTER) {
       contents_bounds += CenterTop(anchor_rect) - CenterBottom(contents_bounds);
     } else if (arrow_ == LEFT_CENTER) {
       contents_bounds += RightCenter(anchor_rect) - LeftCenter(contents_bounds);
     } else if (arrow_ == RIGHT_CENTER) {
       contents_bounds += LeftCenter(anchor_rect) - RightCenter(contents_bounds);
     }
+    // With NO_ASSETS, there should be further insets, but the same logic is
+    // used to position the bubble origin according to |anchor_rect|.
+    DCHECK(shadow_ != NO_ASSETS || shadow_insets.IsEmpty());
     contents_bounds.Inset(-shadow_insets);
     // |arrow_offset_| is used to adjust bubbles that would normally be
     // partially offscreen.
     contents_bounds += gfx::Vector2d(-arrow_offset_, 0);
     return contents_bounds;
   }
 
   int x = anchor_rect.x();
   int y = anchor_rect.y();
   int w = anchor_rect.width();
@@ skipping 111 matching lines @@
 }
 
 gfx::Insets BubbleBorder::GetInsets() const {
   if (UseMd()) {
     if (shadow_ == NO_ASSETS)
       return gfx::Insets();
 
     gfx::Insets blur(kLargeShadowBlur);
     gfx::Insets offset(-kLargeShadowVerticalOffset, 0,
                        kLargeShadowVerticalOffset, 0);
-    gfx::Insets border(kBorderThicknessDip);
     return blur + offset;
   }
 
   // The insets contain the stroke and shadow pixels outside the bubble fill.
   const int inset = GetBorderThickness();
   if (arrow_paint_type_ != PAINT_NORMAL || !has_arrow(arrow_))
     return gfx::Insets(inset);
 
   int first_inset = inset;
   int second_inset = std::max(inset, images_->arrow_thickness);
@@ skipping 183 matching lines @@
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(border_->background_color());
   SkPath path;
   gfx::RectF bounds(view->GetLocalBounds());
   bounds.Inset(gfx::InsetsF(border_->GetInsets()));
 
   canvas->DrawRoundRect(bounds, border_->GetBorderCornerRadius(), paint);
 }
 
 }  // namespace views