LayoutTheme: Clean up popupInternalPadding* functions.

third_party/WebKit/Source/core/layout/LayoutThemeMac.mm

 /*
  * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  *
  * 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,
@@ skipping 739 matching lines @@
     setFontFromControlSize(style, controlSize);
 }
 
 static const int baseBorderRadius = 5;
 static const int styledPopupPaddingStart = 8;
 static const int styledPopupPaddingTop = 1;
 static const int styledPopupPaddingBottom = 2;
 
 // These functions are called with MenuListPart or MenulistButtonPart appearance
 // by LayoutMenuList.
-int LayoutThemeMac::popupInternalPaddingLeft(const ComputedStyle& style) const
+int LayoutThemeMac::popupInternalPaddingStart(const ComputedStyle& style) const
 {
-    bool isRTL = style.direction() == RTL;
     if (style.appearance() == MenulistPart)
-        return popupButtonPadding(controlSizeForFont(style))[isRTL ? ThemeMac::RightMargin : ThemeMac::LeftMargin] * style.effectiveZoom();
+        return popupButtonPadding(controlSizeForFont(style))[ThemeMac::LeftMargin] * style.effectiveZoom();
+    if (style.appearance() == MenulistButtonPart)
+        return styledPopupPaddingStart * style.effectiveZoom();
+    return 0;
+}
+
+int LayoutThemeMac::popupInternalPaddingEnd(const ComputedStyle& style) const
+{
+    if (style.appearance() == MenulistPart)
+        return popupButtonPadding(controlSizeForFont(style))[ThemeMac::RightMargin] * style.effectiveZoom();
     if (style.appearance() != MenulistButtonPart)
         return 0;
-    if (isRTL) {
-        float fontScale = style.fontSize() / baseFontSize;
-        float arrowWidth = menuListBaseArrowWidth * fontScale;
-        return static_cast<int>(ceilf(arrowWidth + (menuListArrowPaddingStart + menuListArrowPaddingEnd) * style.effectiveZoom()));
-    }
-    return styledPopupPaddingStart * style.effectiveZoom();
-}
-
-int LayoutThemeMac::popupInternalPaddingRight(const ComputedStyle& style) const
-{
-    bool isRTL = style.direction() == RTL;
-    if (style.appearance() == MenulistPart)
-        return popupButtonPadding(controlSizeForFont(style))[isRTL ? ThemeMac::LeftMargin : ThemeMac::RightMargin] * style.effectiveZoom();
-    if (style.appearance() != MenulistButtonPart)
-        return 0;
-    if (isRTL) {
-        return styledPopupPaddingStart * style.effectiveZoom();
-    }
     float fontScale = style.fontSize() / baseFontSize;
     float arrowWidth = menuListBaseArrowWidth * fontScale;
     return static_cast<int>(ceilf(arrowWidth + (menuListArrowPaddingStart + menuListArrowPaddingEnd) * style.effectiveZoom()));
 }
 
 int LayoutThemeMac::popupInternalPaddingTop(const ComputedStyle& style) const
 {
     if (style.appearance() == MenulistPart)
         return popupButtonPadding(controlSizeForFont(style))[ThemeMac::TopMargin] * style.effectiveZoom();
     if (style.appearance() == MenulistButtonPart)
@@ skipping 321 matching lines @@
 
 bool LayoutThemeMac::shouldUseFallbackTheme(const ComputedStyle& style) const
 {
     ControlPart part = style.appearance();
     if (part == CheckboxPart || part == RadioPart)
         return style.effectiveZoom() != 1;
     return false;
 }
 
 } // namespace blink