Native themes: Add menu separator part

ui/native_theme/native_theme_base.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/native_theme/native_theme_base.h"
 
 #include <limits>
 #include <memory>
 
 #include "base/command_line.h"
@@ skipping 166 matching lines @@
       break;
     case kInnerSpinButton:
       PaintInnerSpinButton(canvas, state, rect, extra.inner_spin);
       break;
     case kMenuList:
       PaintMenuList(canvas, state, rect, extra.menu_list);
       break;
     case kMenuPopupBackground:
       PaintMenuPopupBackground(canvas, rect.size(), extra.menu_background);
       break;
+    case kMenuPopupSeparator:
+      PaintMenuSeparator(canvas, state, rect, extra.menu_separator);
+      break;
     case kMenuItemBackground:
       PaintMenuItemBackground(canvas, state, rect, extra.menu_item);
       break;
     case kProgressBar:
       PaintProgressBar(canvas, state, rect, extra.progress_bar);
       break;
     case kPushButton:
       PaintButton(canvas, state, rect, extra.button);
       break;
     case kRadio:
@@ skipping 570 matching lines @@
 }
 
 void NativeThemeBase::PaintMenuItemBackground(
     SkCanvas* canvas,
     State state,
     const gfx::Rect& rect,
     const MenuItemExtraParams& menu_item) const {
   // By default don't draw anything over the normal background.
 }
 
+void NativeThemeBase::PaintMenuSeparator(
+    SkCanvas* canvas,
+    State state,
+    const gfx::Rect& rect,
+    const MenuSeparatorExtraParams& menu_separator) const {

[sky, 2017/01/25 21:57:22]

Why is there rect and menu_separator.paint_rect? AFAICT you never use rect.
Seems better to use rect as an arg.

[Tom (Use chromium acct), 2017/01/25 22:25:44]

rect is the region the paint context is clipped to.  paint_rect is contained in
rect, and is used as a suggestion for where to paint the separator.

rect is used in NativeThemeGtk3, where menu_separator.paint_rect is not.  The
reason for this is Chrome usually wants to render a 1px border, but Gtk borders
might have a minimum size of 2px (eg. when borders are two-tone).

+  SkPaint paint;
+  paint.setColor(GetSystemColor(ui::NativeTheme::kColorId_MenuSeparatorColor));
+  canvas->drawRect(gfx::RectToSkRect(*menu_separator.paint_rect), paint);
+}
+
 void NativeThemeBase::PaintSliderTrack(SkCanvas* canvas,
                                        State state,
                                        const gfx::Rect& rect,
                                        const SliderExtraParams& slider) const {
   const int kMidX = rect.x() + rect.width() / 2;
   const int kMidY = rect.y() + rect.height() / 2;
 
   SkPaint paint;
   paint.setColor(kSliderTrackBackgroundColor);
 
@@ skipping 218 matching lines @@
   SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f);
   SkScalar diff = Clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);
 
   if (hsv1[2] + hsv2[2] > 1.0)
     diff = -diff;
 
   return SaturateAndBrighten(hsv2, -0.2f, diff);
 }
 
 }  // namespace ui