Support high dpi in menu scroll arrow, submenu arrow and drag_utils.

ui/views/controls/menu/menu_scroll_view_container.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/controls/menu/menu_scroll_view_container.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <uxtheme.h>
 #include <Vssym32.h>
 #endif
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/native_theme/native_theme.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/submenu_view.h"
 
+#include "third_party/skia/include/core/SkPath.h"

[Ben Goodger (Google), 2012/07/12 03:12:45]

sort with others

[oshima, 2012/07/12 04:00:19]

Done.

+#include "third_party/skia/include/core/SkPaint.h"
+
 using ui::NativeTheme;
 
 // Height of the scroll arrow.
 // This goes up to 4 with large fonts, but this is close enough for now.
 static const int scroll_arrow_height = 3;
 
 namespace views {
 
 namespace {
 
@@ skipping 53 matching lines @@
                                    NativeTheme::kNormal, item_bounds, extra);
 #if defined(OS_WIN)
     SkColor arrow_color = color_utils::GetSysSkColor(COLOR_MENUTEXT);
 #else
     SkColor arrow_color = SK_ColorBLACK;
 #endif
 
     // Then the arrow.
     int x = width() / 2;
     int y = (height() - config.scroll_arrow_height) / 2;
-    int delta_y = 1;
+
+    int x_left = x - config.scroll_arrow_height;
+    int x_right = x + config.scroll_arrow_height;
+    int y_bottom;
+
     if (!is_up_) {
-      delta_y = -1;
-      y += config.scroll_arrow_height;
+      y_bottom = y;
+      y = y_bottom + config.scroll_arrow_height;
+    } else {
+      y_bottom = y + config.scroll_arrow_height;
     }
-    for (int i = 0; i < config.scroll_arrow_height; ++i, --x, y += delta_y)
-      canvas->FillRect(gfx::Rect(x, y, (i * 2) + 1, 1), arrow_color);
+    SkPath path;
+    path.setFillType(SkPath::kWinding_FillType);
+    path.moveTo(SkIntToScalar(x), SkIntToScalar(y));
+    path.lineTo(SkIntToScalar(x_left), SkIntToScalar(y_bottom));
+    path.lineTo(SkIntToScalar(x_right), SkIntToScalar(y_bottom));
+    path.lineTo(SkIntToScalar(x), SkIntToScalar(y));
+    SkPaint paint;
+    paint.setStyle(SkPaint::kFill_Style);
+    paint.setAntiAlias(true);
+    paint.setColor(arrow_color);
+    canvas->DrawPath(path, paint);
   }
 
  private:
   // SubmenuView we were created for.
   SubmenuView* host_;
 
   // Direction of the button.
   bool is_up_;
 
   // Preferred height.
@@ skipping 125 matching lines @@
 
 void MenuScrollViewContainer::OnBoundsChanged(
     const gfx::Rect& previous_bounds) {
   gfx::Size content_pref = scroll_view_->GetContents()->GetPreferredSize();
   scroll_up_button_->SetVisible(content_pref.height() > height());
   scroll_down_button_->SetVisible(content_pref.height() > height());
   Layout();
 }
 
 }  // namespace views