SELECT element: Fix a bug that intrinsic width is too narrow in less-than-100% zoom level.

third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp

 /*
  * Copyright (C) 2007 Apple Inc.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Collabora Ltd.
  * Copyright (C) 2008, 2009 Google Inc.
  * Copyright (C) 2009 Kenneth Rohde Christiansen
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "core/paint/ThemePainterDefault.h"
 
+#include "core/frame/FrameView.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/LayoutProgress.h"
-#include "core/layout/LayoutTheme.h"
+#include "core/layout/LayoutThemeDefault.h"
 #include "core/paint/MediaControlsPainter.h"
 #include "core/paint/PaintInfo.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebThemeEngine.h"
 
 namespace blink {
 
 namespace {
 
 const unsigned defaultButtonBackgroundColor = 0xffdddddd;
-const unsigned mockDropdownMenuListArrowPadding = 3;
-// This is equal to the padding provided by the LayoutMenuList which is
-// calculated based on |menuListArrowPaddingSize| in LayoutThemeDefault.
-const unsigned mockDropdownMenuListArrowWidth = 18;
 
 bool useMockTheme() {
   return LayoutTestSupport::isMockThemeEnabledForTest();
 }
 
 WebThemeEngine::State getWebThemeState(const LayoutObject& o) {
   if (!LayoutTheme::isEnabled(o))
     return WebThemeEngine::StateDisabled;
   if (useMockTheme() && LayoutTheme::isReadOnlyControl(o))
     return WebThemeEngine::StateReadonly;
@@ skipping 76 matching lines @@
   // Move the rect into partLayoutObject's coords.
   partRect.move(offsetFromInputLayoutObject);
   // Account for the local drawing offset.
   partRect.move(localOffset.x(), localOffset.y());
 
   return pixelSnappedIntRect(partRect);
 }
 
 }  // namespace
 
-ThemePainterDefault::ThemePainterDefault() : ThemePainter() {}
+ThemePainterDefault::ThemePainterDefault(LayoutThemeDefault& theme)
+    : ThemePainter(), m_theme(theme) {}
 
 bool ThemePainterDefault::paintCheckbox(const LayoutObject& o,
                                         const PaintInfo& i,
                                         const IntRect& rect) {
   WebThemeEngine::ExtraParams extraParams;
   WebCanvas* canvas = i.context.canvas();
   extraParams.button.checked = LayoutTheme::isChecked(o);
   extraParams.button.indeterminate = LayoutTheme::isIndeterminate(o);
 
   float zoomLevel = o.styleRef().effectiveZoom();
@@ skipping 122 matching lines @@
   Platform::current()->themeEngine()->paint(
       canvas, WebThemeEngine::PartMenuList, getWebThemeState(o), WebRect(rect),
       &extraParams);
   return false;
 }
 
 void ThemePainterDefault::setupMenuListArrow(
     const LayoutBox& box,
     const IntRect& rect,
     WebThemeEngine::ExtraParams& extraParams) {
-  const int right = rect.x() + rect.width();
+  const int left = rect.x() + box.borderLeft();
+  const int right = rect.x() + rect.width() - box.borderRight();
   const int middle = rect.y() + rect.height() / 2;
 
   extraParams.menuList.arrowY = middle;
+  float arrowBoxWidth = m_theme.clampedMenuListArrowPaddingSize(
+      box.frameView()->getHostWindow(), box.styleRef());
+  float arrowScaleFactor = arrowBoxWidth / m_theme.scrollbarThicknessInDIP();
   if (useMockTheme()) {
     // The size and position of the drop-down button is different between
     // the mock theme and the regular aura theme.
-    int extraPadding =
-        mockDropdownMenuListArrowPadding * box.styleRef().effectiveZoom();
-    int arrowBoxWidth =
-        mockDropdownMenuListArrowWidth * box.styleRef().effectiveZoom();
-    int arrowSize = std::min(arrowBoxWidth, rect.height()) - 2 * extraPadding;
+
+    // Padding inside the arrowBox.
+    float extraPadding = 2 * arrowScaleFactor;
+    float arrowSize =
+        std::min(arrowBoxWidth,
+                 static_cast<float>(rect.height() - box.borderTop() -
+                                    box.borderBottom())) -
+        2 * extraPadding;
+    // |arrowX| is the middle position for mock theme engine.
     extraParams.menuList.arrowX =
         (box.styleRef().direction() == RTL)
             ? rect.x() + extraPadding + (arrowSize / 2)
             : right - (arrowSize / 2) - extraPadding;
     extraParams.menuList.arrowSize = arrowSize;
   } else {
-    const int arrowSize = 6;
-    const int arrowPadding = 6;
-    extraParams.menuList.arrowX =
-        (box.styleRef().direction() == RTL)
-            ? rect.x() + arrowPadding * box.styleRef().effectiveZoom() +
-                  box.borderLeft()
-            : right -
-                  (arrowSize + arrowPadding) * box.styleRef().effectiveZoom() -
-                  box.borderRight();
-    extraParams.menuList.arrowSize = arrowSize * box.styleRef().effectiveZoom();
+    // TODO(tkent): This should be 7.0 to match scroll bar buttons.
+    float arrowSize = 6.0 * arrowScaleFactor;
+    // Put the 6px arrow at the center of paddingForArrow area.
+    // |arrowX| is the left position for Aura theme engine.
+    extraParams.menuList.arrowX = (box.styleRef().direction() == RTL)
+                                      ? left + (arrowBoxWidth - arrowSize) / 2
+                                      : right - (arrowBoxWidth + arrowSize) / 2;
+    extraParams.menuList.arrowSize = arrowSize;
   }
   extraParams.menuList.arrowColor = box.resolveColor(CSSPropertyColor).rgb();
 }
 
 bool ThemePainterDefault::paintSliderTrack(const LayoutObject& o,
                                            const PaintInfo& i,
                                            const IntRect& rect) {
   WebThemeEngine::ExtraParams extraParams;
   WebCanvas* canvas = i.context.canvas();
   extraParams.slider.vertical = o.styleRef().appearance() == SliderVerticalPart;
@@ skipping 135 matching lines @@
   DEFINE_STATIC_REF(Image, cancelPressedImage,
                     (Image::loadPlatformResource("searchCancelPressed")));
   paintInfo.context.drawImage(LayoutTheme::isPressed(cancelButtonObject)
                                   ? cancelPressedImage
                                   : cancelImage,
                               paintingRect);
   return false;
 }
 
 }  // namespace blink