Move rendering/RenderMeter to layout/LayoutMeter.

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/LayoutMeter.h"
 #import "core/layout/LayoutProgress.h"
-#import "core/rendering/RenderMeter.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 793 matching lines @@
     [popupButton drawWithFrame:inflatedRect inView:view];
 #if !BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
     if (isFocused(o) && o->style()->outlineStyleIsAuto())
         [popupButton _web_drawFocusRingWithFrame:inflatedRect inView:view];
 #endif
     [popupButton setControlView:nil];
 
     return false;
 }
 
-IntSize LayoutThemeMac::meterSizeForBounds(const RenderMeter* renderMeter, const IntRect& bounds) const
+IntSize LayoutThemeMac::meterSizeForBounds(const LayoutMeter* layoutMeter, const IntRect& bounds) const
 {
-    if (NoControlPart == renderMeter->style()->appearance())
+    if (NoControlPart == layoutMeter->style()->appearance())
         return bounds.size();
 
-    NSLevelIndicatorCell* cell = levelIndicatorFor(renderMeter);
+    NSLevelIndicatorCell* cell = levelIndicatorFor(layoutMeter);
     // Makes enough room for cell's intrinsic size.
     NSSize cellSize = [cell cellSizeForBounds:IntRect(IntPoint(), bounds.size())];
     return IntSize(bounds.width() < cellSize.width ? cellSize.width : bounds.width(),
                    bounds.height() < cellSize.height ? cellSize.height : bounds.height());
 }
 
 bool LayoutThemeMac::paintMeter(LayoutObject* layoutObject, const PaintInfo& paintInfo, const IntRect& rect)
 {
     if (!layoutObject->isMeter())
         return true;
 
     LocalCurrentGraphicsContext localContext(paintInfo.context, rect);
 
-    NSLevelIndicatorCell* cell = levelIndicatorFor(toRenderMeter(layoutObject));
+    NSLevelIndicatorCell* cell = levelIndicatorFor(toLayoutMeter(layoutObject));
     GraphicsContextStateSaver stateSaver(*paintInfo.context);
 
     [cell drawWithFrame:rect inView:documentViewFor(layoutObject)];
     [cell setControlView:nil];
     return false;
 }
 
 bool LayoutThemeMac::supportsMeter(ControlPart part) const
 {
     switch (part) {
@@ skipping 17 matching lines @@
         return NSDiscreteCapacityLevelIndicatorStyle;
     case RatingLevelIndicatorPart:
         return NSRatingLevelIndicatorStyle;
     case MeterPart:
     case ContinuousCapacityLevelIndicatorPart:
     default:
         return NSContinuousCapacityLevelIndicatorStyle;
     }
 }
 
-NSLevelIndicatorCell* LayoutThemeMac::levelIndicatorFor(const RenderMeter* renderMeter) const
+NSLevelIndicatorCell* LayoutThemeMac::levelIndicatorFor(const LayoutMeter* layoutMeter) const
 {
-    const LayoutStyle& style = renderMeter->styleRef();
+    const LayoutStyle& style = layoutMeter->styleRef();
     ASSERT(style.appearance() != NoControlPart);
 
     if (!m_levelIndicator)
         m_levelIndicator.adoptNS([[NSLevelIndicatorCell alloc] initWithLevelIndicatorStyle:NSContinuousCapacityLevelIndicatorStyle]);
     NSLevelIndicatorCell* cell = m_levelIndicator.get();
 
-    HTMLMeterElement* element = renderMeter->meterElement();
+    HTMLMeterElement* element = layoutMeter->meterElement();
     double value = element->value();
 
     // Because NSLevelIndicatorCell does not support optimum-in-the-middle type
     // coloring, we explicitly control the color instead giving low and high
     // value to NSLevelIndicatorCell as is.
     switch (element->gaugeRegion()) {
     case HTMLMeterElement::GaugeRegionOptimum:
         // Make meter the green.
         [cell setWarningValue:value + 1];
         [cell setCriticalValue:value + 2];
@@ skipping 909 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