LayoutTheme: Clean up popupInternalPadding* functions.

third_party/WebKit/Source/core/layout/LayoutThemeDefault.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
@@ skipping 19 matching lines @@
 #include "core/style/ComputedStyle.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/PlatformResourceLoader.h"
 #include "platform/graphics/Color.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebThemeEngine.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
-enum PaddingType {
-    TopPadding,
-    RightPadding,
-    BottomPadding,
-    LeftPadding
-};
-
-static const int styledMenuListInternalPadding[4] = { 1, 4, 1, 4 };
-
 // These values all match Safari/Win.
 static const float defaultControlFontPixelSize = 13;
 static const float defaultCancelButtonSize = 9;
 static const float minCancelButtonSize = 5;
 static const float maxCancelButtonSize = 21;
 static const int menuListArrowPaddingSize = 14;
 
 static bool useMockTheme()
 {
     return LayoutTestSupport::isMockThemeEnabledForTest();
@@ skipping 274 matching lines @@
 {
     // Height is locked to auto on all browsers.
     style.setLineHeight(ComputedStyle::initialLineHeight());
 }
 
 void LayoutThemeDefault::adjustMenuListButtonStyle(ComputedStyle& style, Element* e) const
 {
     adjustMenuListStyle(style, e);
 }
 
-int LayoutThemeDefault::popupInternalPaddingLeft(const ComputedStyle& style) const
+// The following internal paddings are in addition to the user-supplied padding.
+// Matches the Firefox behavior.
+
+int LayoutThemeDefault::popupInternalPaddingStart(const ComputedStyle& style) const
 {
-    return menuListInternalPadding(style, LeftPadding);
+    return menuListInternalPadding(style, 4);
 }
 
-int LayoutThemeDefault::popupInternalPaddingRight(const ComputedStyle& style) const
+int LayoutThemeDefault::popupInternalPaddingEnd(const ComputedStyle& style) const
 {
-    return menuListInternalPadding(style, RightPadding);
+    return menuListInternalPadding(style, 4 + menuListArrowPaddingSize);
 }
 
 int LayoutThemeDefault::popupInternalPaddingTop(const ComputedStyle& style) const
 {
-    return menuListInternalPadding(style, TopPadding);
+    return menuListInternalPadding(style, 1);
 }
 
 int LayoutThemeDefault::popupInternalPaddingBottom(const ComputedStyle& style) const
 {
-    return menuListInternalPadding(style, BottomPadding);
+    return menuListInternalPadding(style, 1);
 }
 
 // static
 void LayoutThemeDefault::setDefaultFontSize(int fontSize)
 {
     LayoutThemeFontProvider::setDefaultFontSize(fontSize);
 }
 
-int LayoutThemeDefault::menuListInternalPadding(const ComputedStyle& style, int paddingType) const
+int LayoutThemeDefault::menuListInternalPadding(const ComputedStyle& style, int padding) const
 {
     if (style.appearance() == NoControlPart)
         return 0;
-    // This internal padding is in addition to the user-supplied padding.
-    // Matches the FF behavior.
-    int padding = styledMenuListInternalPadding[paddingType];
-
-    // Reserve the space for right arrow here. The rest of the padding is
-    // set by adjustMenuListStyle, since PopMenuWin.cpp uses the padding from
-    // LayoutMenuList to lay out the individual items in the popup.
-    const int barType = style.direction() == LTR ? RightPadding : LeftPadding;
-    if (paddingType == barType)
-        padding += menuListArrowPaddingSize;
-
     return padding * style.effectiveZoom();
 }
 
 //
 // Following values are come from default of GTK+
 //
 static const int progressAnimationFrames = 10;
 static const double progressAnimationInterval = 0.125;
 
 double LayoutThemeDefault::animationRepeatIntervalForProgressBar() const
 {
     return progressAnimationInterval;
 }
 
 double LayoutThemeDefault::animationDurationForProgressBar() const
 {
     return progressAnimationInterval * progressAnimationFrames * 2; // "2" for back and forth
 }
 
 } // namespace blink