Revert of Memoize LayoutTheemDefault::clampedMenuListArrowPaddingSize().

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 318 matching lines @@
     const ComputedStyle& style) const {
   return menuListInternalPadding(style, 1);
 }
 
 int LayoutThemeDefault::popupInternalPaddingBottom(
     const ComputedStyle& style) const {
   return menuListInternalPadding(style, 1);
 }
 
 int LayoutThemeDefault::menuListArrowWidthInDIP() const {
+  if (m_menuListArrowWidthInDIP > 0)
+    return m_menuListArrowWidthInDIP;
   int width = Platform::current()
                   ->themeEngine()
                   ->getSize(WebThemeEngine::PartScrollbarUpArrow)
                   .width;
-  return width > 0 ? width : 15;
+  const_cast<LayoutThemeDefault*>(this)->m_menuListArrowWidthInDIP =
+      width > 0 ? width : 15;
+  return m_menuListArrowWidthInDIP;
 }
 
 float LayoutThemeDefault::clampedMenuListArrowPaddingSize(
     const HostWindow* host,
     const ComputedStyle& style) const {
-  if (m_cachedMenuListArrowPaddingSize > 0 &&
-      style.effectiveZoom() == m_cachedMenuListArrowZoomLevel)
-    return m_cachedMenuListArrowPaddingSize;
-  m_cachedMenuListArrowZoomLevel = style.effectiveZoom();
   int originalSize = menuListArrowWidthInDIP();
   int scaledSize =
       host ? host->windowToViewportScalar(originalSize) : originalSize;
   // The result should not be samller than the scrollbar thickness in order to
   // secure space for scrollbar in popup.
   float deviceScale = 1.0f * scaledSize / originalSize;
-  float size;
-  if (m_cachedMenuListArrowZoomLevel < deviceScale) {
-    size = scaledSize;
-  } else {
-    // The value should be zoomed though scrollbars aren't scaled by zoom.
-    // crbug.com/432795.
-    size = originalSize * m_cachedMenuListArrowZoomLevel;
-  }
-  m_cachedMenuListArrowPaddingSize = size;
-  return size;
+  if (style.effectiveZoom() < deviceScale)
+    return scaledSize;
+  // The value should be zoomed though scrollbars aren't scaled by zoom.
+  // crbug.com/432795.
+  return originalSize * style.effectiveZoom();
 }
 
 // static
 void LayoutThemeDefault::setDefaultFontSize(int fontSize) {
   LayoutThemeFontProvider::setDefaultFontSize(fontSize);
 }
 
 int LayoutThemeDefault::menuListInternalPadding(const ComputedStyle& style,
                                                 int padding) const {
   if (style.appearance() == NoControlPart)
@@ skipping 10 matching lines @@
 double LayoutThemeDefault::animationRepeatIntervalForProgressBar() const {
   return progressAnimationInterval;
 }
 
 double LayoutThemeDefault::animationDurationForProgressBar() const {
   return progressAnimationInterval * progressAnimationFrames *
          2;  // "2" for back and forth
 }
 
 }  // namespace blink