Make the size of menulists on Linux the same size as on Windows.

ui/gfx/native_theme_linux.cc

 // Copyright (c) 2010 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/native_theme_linux.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "grit/gfx_resources.h"
@@ skipping 457 matching lines @@
   SkColor light_color(BrightenColor(base_hsl, SkColorGetA(base_color), 0.105));
 
   // If the button is too small, fallback to drawing a single, solid color
   if (rect.width() < 5 || rect.height() < 5) {
     paint.setColor(base_color);
     skrect.set(rect.x(), rect.y(), kRight, kBottom);
     canvas->drawRect(skrect, paint);
     return;
   }
 
-  const int kBorderAlpha = state == kHovered ? 0x80 : 0x55;
-  paint.setARGB(kBorderAlpha, 0, 0, 0);
-  canvas->drawLine(rect.x() + 1, rect.y(), kRight - 1, rect.y(), paint);
-  canvas->drawLine(kRight - 1, rect.y() + 1, kRight - 1, kBottom - 1, paint);
-  canvas->drawLine(rect.x() + 1, kBottom - 1, kRight - 1, kBottom - 1, paint);
-  canvas->drawLine(rect.x(), rect.y() + 1, rect.x(), kBottom - 1, paint);
+  if (button.has_border) {
+    const int kBorderAlpha = state == kHovered ? 0x80 : 0x55;
+    paint.setARGB(kBorderAlpha, 0, 0, 0);
+    canvas->drawLine(rect.x() + 1, rect.y(), kRight - 1, rect.y(), paint);
+    canvas->drawLine(kRight - 1, rect.y() + 1, kRight - 1, kBottom - 1, paint);
+    canvas->drawLine(rect.x() + 1, kBottom - 1, kRight - 1, kBottom - 1, paint);
+    canvas->drawLine(rect.x(), rect.y() + 1, rect.x(), kBottom - 1, paint);
+  }
 
   paint.setColor(SK_ColorBLACK);
   const int kLightEnd = state == kPressed ? 1 : 0;
   const int kDarkEnd = !kLightEnd;
   SkPoint gradient_bounds[2];
   gradient_bounds[kLightEnd].set(SkIntToScalar(rect.x()),
                                  SkIntToScalar(rect.y()));
   gradient_bounds[kDarkEnd].set(SkIntToScalar(rect.x()),
                                 SkIntToScalar(kBottom - 1));
   SkColor colors[2];
   colors[0] = light_color;
   colors[1] = base_color;
 
   SkShader* shader = SkGradientShader::CreateLinear(
       gradient_bounds, colors, NULL, 2, SkShader::kClamp_TileMode, NULL);
   paint.setStyle(SkPaint::kFill_Style);
   paint.setShader(shader);
   shader->unref();
 
-  skrect.set(rect.x() + 1, rect.y() + 1, kRight - 1, kBottom - 1);
+  if (button.has_border) {
+    skrect.set(rect.x() + 1, rect.y() + 1, kRight - 1, kBottom - 1);
+  } else {
+    skrect.set(rect.x(), rect.y(), kRight, kBottom);
+  }
   canvas->drawRect(skrect, paint);
+  paint.setShader(NULL);
 
-  paint.setShader(NULL);
-  paint.setColor(BrightenColor(base_hsl, SkColorGetA(base_color), -0.0588));
-  canvas->drawPoint(rect.x() + 1, rect.y() + 1, paint);
-  canvas->drawPoint(kRight - 2, rect.y() + 1, paint);
-  canvas->drawPoint(rect.x() + 1, kBottom - 2, paint);
-  canvas->drawPoint(kRight - 2, kBottom - 2, paint);
+  if (button.has_border) {
+    paint.setColor(BrightenColor(base_hsl, SkColorGetA(base_color), -0.0588));
+    canvas->drawPoint(rect.x() + 1, rect.y() + 1, paint);
+    canvas->drawPoint(kRight - 2, rect.y() + 1, paint);
+    canvas->drawPoint(rect.x() + 1, kBottom - 2, paint);
+    canvas->drawPoint(kRight - 2, kBottom - 2, paint);
+  }
 }
 
 void NativeThemeLinux::PaintTextField(skia::PlatformCanvas* canvas,
                                       State state,
                                       const gfx::Rect& rect,
                                       const TextFieldExtraParams& text) {
   // The following drawing code simulates the user-agent css border for
   // text area and text input so that we do not break layout tests. Once we
   // have decided the desired looks, we should update the code here and
   // the layout test expectations.
@@ skipping 76 matching lines @@
     path.lineTo(SkIntToScalar(right), SkIntToScalar(bottom));
     path.lineTo(SkIntToScalar(right), SkIntToScalar(top));
     canvas->drawPath(path, light_paint);
   }
 }
 
 void NativeThemeLinux::PaintMenuList(skia::PlatformCanvas* canvas,
                                      State state,
                                      const gfx::Rect& rect,
                                      const MenuListExtraParams& menu_list) {
-  ButtonExtraParams button = { 0 };
-  button.background_color = menu_list.background_color;
-  PaintButton(canvas, state, rect, button);
+  // If a border radius is specified, we let the WebCore paint the background
+  // and the border of the control.
+  if (!menu_list.has_border_radius) {
+    ButtonExtraParams button = { 0 };
+    button.background_color = menu_list.background_color;
+    button.has_border = menu_list.has_border;
+    PaintButton(canvas, state, rect, button);
+  }
 
   SkPaint paint;
   paint.setColor(SK_ColorBLACK);
   paint.setAntiAlias(true);
   paint.setStyle(SkPaint::kFill_Style);
 
   SkPath path;
   path.moveTo(menu_list.arrow_x, menu_list.arrow_y - 3);
   path.rLineTo(6, 0);
   path.rLineTo(-3, 6);
@@ skipping 311 matching lines @@
 
 void NativeThemeLinux::SetScrollbarColors(unsigned inactive_color,
                                           unsigned active_color,
                                           unsigned track_color) const {
   thumb_inactive_color_ = inactive_color;
   thumb_active_color_ = active_color;
   track_color_ = track_color;
 }
 
 }  // namespace gfx