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

third_party/WebKit/Source/core/paint/ThemePainterMac.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 179 matching lines @@
     [popupButton setControlView:nil];
 
     return false;
 }
 
 bool ThemePainterMac::paintProgressBar(const LayoutObject& layoutObject, const PaintInfo& paintInfo, const IntRect& rect)
 {
     if (!layoutObject.isProgress())
         return true;
 
-    float zoomLevel = layoutObject.styleRef().effectiveZoom();
-    NSControlSize controlSize = m_layoutTheme.controlSizeForFont(layoutObject.styleRef());
-    IntSize size = m_layoutTheme.progressBarSizes()[controlSize];
-    size.setHeight(size.height() * zoomLevel);
-    size.setWidth(rect.width());
-
-    // Now inflate it to account for the shadow.
-    IntRect inflatedRect = rect;
-    if (rect.height() <= m_layoutTheme.minimumProgressBarHeight(layoutObject.styleRef()))
-        inflatedRect = ThemeMac::inflateRect(inflatedRect, size, m_layoutTheme.progressBarMargins(controlSize), zoomLevel);
-
     const LayoutProgress& layoutProgress = toLayoutProgress(layoutObject);
     HIThemeTrackDrawInfo trackInfo;
     trackInfo.version = 0;
+    NSControlSize controlSize = m_layoutTheme.controlSizeForFont(layoutObject.styleRef());
     if (controlSize == NSRegularControlSize)
         trackInfo.kind = layoutProgress.position() < 0 ? kThemeLargeIndeterminateBar : kThemeLargeProgressBar;
     else
         trackInfo.kind = layoutProgress.position() < 0 ? kThemeMediumIndeterminateBar : kThemeMediumProgressBar;
 
-    trackInfo.bounds = IntRect(IntPoint(), inflatedRect.size());
+    trackInfo.bounds = IntRect(IntPoint(), rect.size());
     trackInfo.min = 0;
     trackInfo.max = std::numeric_limits<SInt32>::max();
     trackInfo.value = lround(layoutProgress.position() * nextafter(trackInfo.max, 0));
     trackInfo.trackInfo.progress.phase = lround(layoutProgress.animationProgress() * nextafter(LayoutThemeMac::progressAnimationNumFrames, 0));
     trackInfo.attributes = kThemeTrackHorizontal;
     trackInfo.enableState = LayoutTheme::isActive(layoutObject) ? kThemeTrackActive : kThemeTrackInactive;
     trackInfo.reserved = 0;
     trackInfo.filler1 = 0;
 
-    std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(inflatedRect.size());
+    std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(rect.size());
     if (!imageBuffer)
         return true;
 
-    IntRect clipRect = IntRect(IntPoint(), inflatedRect.size());
+    IntRect clipRect = IntRect(IntPoint(), rect.size());
     LocalCurrentGraphicsContext localContext(imageBuffer->canvas(), 1, clipRect);
     CGContextRef cgContext = localContext.cgContext();
     HIThemeDrawTrack(&trackInfo, 0, cgContext, kHIThemeOrientationNormal);
 
     GraphicsContextStateSaver stateSaver(paintInfo.context);
 
     if (!layoutProgress.styleRef().isLeftToRightDirection()) {
-        paintInfo.context.translate(2 * inflatedRect.x() + inflatedRect.width(), 0);
+        paintInfo.context.translate(2 * rect.x() + rect.width(), 0);
         paintInfo.context.scale(-1, 1);
     }
 
     if (!paintInfo.context.contextDisabled())
-        imageBuffer->draw(paintInfo.context, FloatRect(inflatedRect.location(), FloatSize(imageBuffer->size())), nullptr, SkXfermode::kSrcOver_Mode);
+        imageBuffer->draw(paintInfo.context, FloatRect(rect.location(), FloatSize(imageBuffer->size())), nullptr, SkXfermode::kSrcOver_Mode);
     return false;
 }
 
 bool ThemePainterMac::paintMenuListButton(const LayoutObject& o, const PaintInfo& paintInfo, const IntRect& r)
 {
     IntRect bounds = IntRect(r.x() + o.styleRef().borderLeftWidth(),
                              r.y() + o.styleRef().borderTopWidth(),
                              r.width() - o.styleRef().borderLeftWidth() - o.styleRef().borderRightWidth(),
                              r.height() - o.styleRef().borderTopWidth() - o.styleRef().borderBottomWidth());
     // Since we actually know the size of the control here, we restrict the font
@@ skipping 291 matching lines @@
     paintInfo.context.rotate(deg2rad(-45.0));
     paintInfo.context.translate(-centerX, -centerY);
 
     paintInfo.context.setFillColor(fillColor);
     paintInfo.context.fillEllipse(unzoomedRect);
 
     return false;
 }
 
 } // namespace blink