Move rendering/RenderProgress to layout/LayoutProgress

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 22 matching lines @@
 #import "core/html/HTMLMeterElement.h"
 #import "core/html/TimeRanges.h"
 #import "core/html/shadow/MediaControlElements.h"
 #import "core/layout/Layer.h"
 #import "core/layout/LayoutSlider.h"
 #import "core/layout/PaintInfo.h"
 #import "core/layout/style/AuthorStyleInfo.h"
 #import "core/layout/style/ShadowList.h"
 #import "core/layout/LayoutMedia.h"
 #import "core/layout/LayoutMediaControls.h"
+#import "core/layout/LayoutProgress.h"
 #import "core/rendering/RenderMeter.h"
-#import "core/rendering/RenderProgress.h"
 #import "core/rendering/RenderView.h"
 #import "platform/LayoutTestSupport.h"
 #import "platform/PlatformResourceLoader.h"
 #import "platform/SharedBuffer.h"
 #import "platform/geometry/FloatRoundedRect.h"
 #import "platform/graphics/BitmapImage.h"
 #import "platform/graphics/GraphicsContextStateSaver.h"
 #import "platform/graphics/Image.h"
 #import "platform/graphics/ImageBuffer.h"
 #import "platform/mac/ColorMac.h"
@@ skipping 915 matching lines @@
         { 0, 0, 1, 0 },
     };
     return margins[controlSize];
 }
 
 int LayoutThemeMac::minimumProgressBarHeight(const LayoutStyle& style) const
 {
     return sizeForSystemFont(style, progressBarSizes()).height();
 }
 
-double LayoutThemeMac::animationRepeatIntervalForProgressBar(RenderProgress*) const
+double LayoutThemeMac::animationRepeatIntervalForProgressBar(LayoutProgress*) const
 {
     return progressAnimationFrameRate;
 }
 
-double LayoutThemeMac::animationDurationForProgressBar(RenderProgress*) const
+double LayoutThemeMac::animationDurationForProgressBar(LayoutProgress*) const
 {
     return progressAnimationNumFrames * progressAnimationFrameRate;
 }
 
 bool LayoutThemeMac::paintProgressBar(LayoutObject* layoutObject, const PaintInfo& paintInfo, const IntRect& rect)
 {
     if (!layoutObject->isProgress())
         return true;
 
     float zoomLevel = layoutObject->style()->effectiveZoom();
     int controlSize = controlSizeForFont(layoutObject->styleRef());
     IntSize size = 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() <= minimumProgressBarHeight(layoutObject->styleRef()))
         inflatedRect = ThemeMac::inflateRect(inflatedRect, size, progressBarMargins(controlSize), zoomLevel);
 
-    RenderProgress* renderProgress = toRenderProgress(layoutObject);
+    LayoutProgress* renderProgress = toLayoutProgress(layoutObject);
     HIThemeTrackDrawInfo trackInfo;
     trackInfo.version = 0;
     if (controlSize == NSRegularControlSize)
         trackInfo.kind = renderProgress->position() < 0 ? kThemeLargeIndeterminateBar : kThemeLargeProgressBar;
     else
         trackInfo.kind = renderProgress->position() < 0 ? kThemeMediumIndeterminateBar : kThemeMediumProgressBar;
 
     trackInfo.bounds = IntRect(IntPoint(), inflatedRect.size());
     trackInfo.min = 0;
     trackInfo.max = std::numeric_limits<SInt32>::max();
@@ skipping 827 matching lines @@
 
 bool LayoutThemeMac::shouldUseFallbackTheme(const LayoutStyle& style) const
 {
     ControlPart part = style.appearance();
     if (part == CheckboxPart || part == RadioPart)
         return style.effectiveZoom() != 1;
     return false;
 }
 
 } // namespace blink