Move rendering/RenderObject to layout/LayoutObject.

Source/core/layout/LayoutThemeChromiumSkia.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.
  *
  * 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "config.h"
 #include "core/layout/LayoutThemeChromiumSkia.h"
 
+#include "core/layout/LayoutObject.h"
 #include "core/layout/LayoutThemeChromiumFontProvider.h"
 #include "core/rendering/PaintInfo.h"
 #include "core/rendering/RenderBox.h"
 #include "core/rendering/RenderMediaControls.h"
-#include "core/rendering/RenderObject.h"
 #include "core/rendering/RenderProgress.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/PlatformResourceLoader.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/Image.h"
 #include "platform/scroll/ScrollbarTheme.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/StdLibExtras.h"
 
 namespace blink {
@@ skipping 133 matching lines @@
 }
 
 void LayoutThemeChromiumSkia::adjustButtonStyle(RenderStyle& style, Element*) const
 {
     if (style.appearance() == PushButtonPart) {
         // Ignore line-height.
         style.setLineHeight(RenderStyle::initialLineHeight());
     }
 }
 
-bool LayoutThemeChromiumSkia::paintTextArea(RenderObject* o, const PaintInfo& i, const IntRect& r)
+bool LayoutThemeChromiumSkia::paintTextArea(LayoutObject* o, const PaintInfo& i, const IntRect& r)
 {
     return paintTextField(o, i, r);
 }
 
 void LayoutThemeChromiumSkia::adjustSearchFieldStyle(RenderStyle& style, Element*) const
 {
     // Ignore line-height.
     style.setLineHeight(RenderStyle::initialLineHeight());
 }
 
-bool LayoutThemeChromiumSkia::paintSearchField(RenderObject* o, const PaintInfo& i, const IntRect& r)
+bool LayoutThemeChromiumSkia::paintSearchField(LayoutObject* o, const PaintInfo& i, const IntRect& r)
 {
     return paintTextField(o, i, r);
 }
 
 void LayoutThemeChromiumSkia::adjustSearchFieldCancelButtonStyle(RenderStyle& style, Element*) const
 {
     // Scale the button size based on the font size
     float fontScale = style.fontSize() / defaultControlFontPixelSize;
     int cancelButtonSize = lroundf(std::min(std::max(minCancelButtonSize, defaultCancelButtonSize * fontScale), maxCancelButtonSize));
     style.setWidth(Length(cancelButtonSize, Fixed));
     style.setHeight(Length(cancelButtonSize, Fixed));
 }
 
-IntRect LayoutThemeChromiumSkia::convertToPaintingRect(RenderObject* inputRenderer, const RenderObject* partRenderer, LayoutRect partRect, const IntRect& localOffset) const
+IntRect LayoutThemeChromiumSkia::convertToPaintingRect(LayoutObject* inputRenderer, const LayoutObject* partRenderer, LayoutRect partRect, const IntRect& localOffset) const
 {
     // Compute an offset between the part renderer and the input renderer.
     LayoutSize offsetFromInputRenderer = -partRenderer->offsetFromAncestorContainer(inputRenderer);
     // Move the rect into partRenderer's coords.
     partRect.move(offsetFromInputRenderer);
     // Account for the local drawing offset.
     partRect.move(localOffset.x(), localOffset.y());
 
     return pixelSnappedIntRect(partRect);
 }
 
-bool LayoutThemeChromiumSkia::paintSearchFieldCancelButton(RenderObject* cancelButtonObject, const PaintInfo& paintInfo, const IntRect& r)
+bool LayoutThemeChromiumSkia::paintSearchFieldCancelButton(LayoutObject* cancelButtonObject, const PaintInfo& paintInfo, const IntRect& r)
 {
     // Get the renderer of <input> element.
     if (!cancelButtonObject->node())
         return false;
     Node* input = cancelButtonObject->node()->shadowHost();
-    RenderObject* baseRenderer = input ? input->renderer() : cancelButtonObject;
+    LayoutObject* baseRenderer = input ? input->renderer() : cancelButtonObject;
     if (!baseRenderer->isBox())
         return false;
     RenderBox* inputRenderBox = toRenderBox(baseRenderer);
     LayoutRect inputContentBox = inputRenderBox->contentBoxRect();
 
     // Make sure the scaled button stays square and will fit in its parent's box.
     LayoutUnit cancelButtonSize = std::min(inputContentBox.width(), std::min<LayoutUnit>(inputContentBox.height(), r.height()));
     // Calculate cancel button's coordinates relative to the input element.
     // Center the button vertically.  Round up though, so if it has to be one pixel off-center, it will
     // be one pixel closer to the bottom of the field.  This tends to look better with the text.
@@ skipping 18 matching lines @@
 void LayoutThemeChromiumSkia::adjustSearchFieldResultsDecorationStyle(RenderStyle& style, Element*) const
 {
     // Scale the decoration size based on the font size
     float fontScale = style.fontSize() / defaultControlFontPixelSize;
     int magnifierSize = lroundf(std::min(std::max(minSearchFieldResultsDecorationSize, defaultSearchFieldResultsDecorationSize * fontScale),
         maxSearchFieldResultsDecorationSize));
     style.setWidth(Length(magnifierSize, Fixed));
     style.setHeight(Length(magnifierSize, Fixed));
 }
 
-bool LayoutThemeChromiumSkia::paintSearchFieldResultsDecoration(RenderObject* magnifierObject, const PaintInfo& paintInfo, const IntRect& r)
+bool LayoutThemeChromiumSkia::paintSearchFieldResultsDecoration(LayoutObject* magnifierObject, const PaintInfo& paintInfo, const IntRect& r)
 {
     // Get the renderer of <input> element.
     if (!magnifierObject->node())
         return false;
     Node* input = magnifierObject->node()->shadowHost();
-    RenderObject* baseRenderer = input ? input->renderer() : magnifierObject;
+    LayoutObject* baseRenderer = input ? input->renderer() : magnifierObject;
     if (!baseRenderer->isBox())
         return false;
     RenderBox* inputRenderBox = toRenderBox(baseRenderer);
     LayoutRect inputContentBox = inputRenderBox->contentBoxRect();
 
     // Make sure the scaled decoration stays square and will fit in its parent's box.
     LayoutUnit magnifierSize = std::min(inputContentBox.width(), std::min<LayoutUnit>(inputContentBox.height(), r.height()));
     // Calculate decoration's coordinates relative to the input element.
     // Center the decoration vertically.  Round up though, so if it has to be one pixel off-center, it will
     // be one pixel closer to the bottom of the field.  This tends to look better with the text.
     LayoutRect magnifierRect(magnifierObject->offsetFromAncestorContainer(inputRenderBox).width(),
         inputContentBox.y() + (inputContentBox.height() - magnifierSize + 1) / 2,
         magnifierSize, magnifierSize);
     IntRect paintingRect = convertToPaintingRect(inputRenderBox, magnifierObject, magnifierRect, r);
 
     DEFINE_STATIC_REF(Image, magnifierImage, (Image::loadPlatformResource("searchMagnifier")));
     paintInfo.context->drawImage(magnifierImage, paintingRect);
     return false;
 }
 
-bool LayoutThemeChromiumSkia::paintMediaSliderTrack(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumSkia::paintMediaSliderTrack(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaSlider, object, paintInfo, rect);
 }
 
-bool LayoutThemeChromiumSkia::paintMediaVolumeSliderTrack(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumSkia::paintMediaVolumeSliderTrack(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaVolumeSlider, object, paintInfo, rect);
 }
 
 void LayoutThemeChromiumSkia::adjustSliderThumbSize(RenderStyle& style, Element*) const
 {
     RenderMediaControls::adjustMediaSliderThumbSize(style);
 }
 
-bool LayoutThemeChromiumSkia::paintMediaSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumSkia::paintMediaSliderThumb(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaSliderThumb, object, paintInfo, rect);
 }
 
-bool LayoutThemeChromiumSkia::paintMediaToggleClosedCaptionsButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool LayoutThemeChromiumSkia::paintMediaToggleClosedCaptionsButton(LayoutObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaShowClosedCaptionsButton, o, paintInfo, r);
 }
 
-bool LayoutThemeChromiumSkia::paintMediaCastButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
+bool LayoutThemeChromiumSkia::paintMediaCastButton(LayoutObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaCastOffButton, o, paintInfo, r);
 }
 
-bool LayoutThemeChromiumSkia::paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumSkia::paintMediaVolumeSliderThumb(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaVolumeSliderThumb, object, paintInfo, rect);
 }
 
-bool LayoutThemeChromiumSkia::paintMediaPlayButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumSkia::paintMediaPlayButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaPlayButton, object, paintInfo, rect);
 }
 
-bool LayoutThemeChromiumSkia::paintMediaOverlayPlayButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumSkia::paintMediaOverlayPlayButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaOverlayPlayButton, object, paintInfo, rect);
 }
 
-bool LayoutThemeChromiumSkia::paintMediaMuteButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumSkia::paintMediaMuteButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaMuteButton, object, paintInfo, rect);
 }
 
 String LayoutThemeChromiumSkia::formatMediaControlsTime(float time) const
 {
     return RenderMediaControls::formatMediaControlsTime(time);
 }
 
 String LayoutThemeChromiumSkia::formatMediaControlsCurrentTime(float currentTime, float duration) const
 {
     return RenderMediaControls::formatMediaControlsCurrentTime(currentTime, duration);
 }
 
-bool LayoutThemeChromiumSkia::paintMediaFullscreenButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool LayoutThemeChromiumSkia::paintMediaFullscreenButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     return RenderMediaControls::paintMediaControlsPart(MediaEnterFullscreenButton, object, paintInfo, rect);
 }
 
 void LayoutThemeChromiumSkia::adjustMenuListStyle(RenderStyle& style, Element*) const
 {
     // Height is locked to auto on all browsers.
     style.setLineHeight(RenderStyle::initialLineHeight());
 }
 
 void LayoutThemeChromiumSkia::adjustMenuListButtonStyle(RenderStyle& style, Element* e) const
 {
     adjustMenuListStyle(style, e);
 }
 
 // Used to paint styled menulists (i.e. with a non-default border)
-bool LayoutThemeChromiumSkia::paintMenuListButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
+bool LayoutThemeChromiumSkia::paintMenuListButton(LayoutObject* o, const PaintInfo& i, const IntRect& rect)
 {
     return paintMenuList(o, i, rect);
 }
 
 int LayoutThemeChromiumSkia::popupInternalPaddingLeft(const RenderStyle& style) const
 {
     return menuListInternalPadding(style, LeftPadding);
 }
 
 int LayoutThemeChromiumSkia::popupInternalPaddingRight(const RenderStyle& style) const
@@ skipping 85 matching lines @@
 double LayoutThemeChromiumSkia::animationDurationForProgressBar(RenderProgress* renderProgress) const
 {
     return progressAnimationInterval * progressAnimationFrames * 2; // "2" for back and forth
 }
 
 IntRect LayoutThemeChromiumSkia::progressValueRectFor(RenderProgress* renderProgress, const IntRect& rect) const
 {
     return renderProgress->isDeterminate() ? determinateProgressValueRectFor(renderProgress, rect) : indeterminateProgressValueRectFor(renderProgress, rect);
 }
 
-LayoutThemeChromiumSkia::DirectionFlippingScope::DirectionFlippingScope(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
+LayoutThemeChromiumSkia::DirectionFlippingScope::DirectionFlippingScope(LayoutObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
     : m_needsFlipping(!renderer->style()->isLeftToRightDirection())
     , m_paintInfo(paintInfo)
 {
     if (!m_needsFlipping)
         return;
     m_paintInfo.context->save();
     m_paintInfo.context->translate(2 * rect.x() + rect.width(), 0);
     m_paintInfo.context->scale(-1, 1);
 }
 
 LayoutThemeChromiumSkia::DirectionFlippingScope::~DirectionFlippingScope()
 {
     if (!m_needsFlipping)
         return;
     m_paintInfo.context->restore();
 }
 
 } // namespace blink