Mac: adjust sizes of progress bars to be equal to painted size.

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 666 matching lines @@
 {
     static const int padding[3][4] =
     {
         { 2, 26, 3, 8 },
         { 2, 23, 3, 8 },
         { 2, 22, 3, 10 }
     };
     return padding[size];
 }
 
-const IntSize* LayoutThemeMac::progressBarSizes() const
+const int* LayoutThemeMac::progressBarHeights() const
 {
-    static const IntSize sizes[3] = { IntSize(0, 20), IntSize(0, 12), IntSize(0, 12) };
+    static const int sizes[3] = { 20, 12, 12 };
     return sizes;
 }
 
-const int* LayoutThemeMac::progressBarMargins(NSControlSize controlSize) const
-{
-    static const int margins[3][4] =
-    {
-        { 0, 0, 1, 0 },
-        { 0, 0, 1, 0 },
-        { 0, 0, 1, 0 },
-    };
-    return margins[controlSize];
-}
-
-int LayoutThemeMac::minimumProgressBarHeight(const ComputedStyle& style) const
-{
-    return sizeForSystemFont(style, progressBarSizes()).height();
-}
-
 double LayoutThemeMac::animationRepeatIntervalForProgressBar() const
 {
     return progressAnimationFrameRate;
 }
 
 double LayoutThemeMac::animationDurationForProgressBar() const
 {
     return progressAnimationNumFrames * progressAnimationFrameRate;
 }
 
@@ skipping 199 matching lines @@
 IntSize LayoutThemeMac::sliderTickSize() const
 {
     return IntSize(1, 3);
 }
 
 int LayoutThemeMac::sliderTickOffsetFromTrackCenter() const
 {
     return -9;
 }
 
+void LayoutThemeMac::adjustProgressBarBounds(ComputedStyle& style) const
+{
+    float zoomLevel = style.effectiveZoom();
+    NSControlSize controlSize = controlSizeForFont(style);
+    int height = progressBarHeights()[controlSize] * zoomLevel;
+
+    // Now inflate it to account for the shadow.
+    style.setMinHeight(Length(height + zoomLevel, Fixed));
+}
+
 void LayoutThemeMac::adjustSliderThumbSize(ComputedStyle& style) const
 {
     float zoomLevel = style.effectiveZoom();
     if (style.appearance() == SliderThumbHorizontalPart || style.appearance() == SliderThumbVerticalPart) {
         style.setWidth(Length(static_cast<int>(sliderThumbWidth * zoomLevel), Fixed));
         style.setHeight(Length(static_cast<int>(sliderThumbHeight * zoomLevel), Fixed));
     } else {
         adjustMediaSliderThumbSize(style);
     }
 }
@@ skipping 168 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