Move rendering/RenderObject to layout/LayoutObject.

Source/core/rendering/RenderMediaControls.cpp

 /*
  * Copyright (C) 2009 Apple Inc.
  * Copyright (C) 2009 Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 48 matching lines @@
     return mediaElement->networkState() != HTMLMediaElement::NETWORK_EMPTY
         && mediaElement->networkState() != HTMLMediaElement::NETWORK_NO_SOURCE;
 }
 
 static bool paintMediaButton(GraphicsContext* context, const IntRect& rect, Image* image)
 {
     context->drawImage(image, rect);
     return true;
 }
 
-static bool paintMediaMuteButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaMuteButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     HTMLMediaElement* mediaElement = toParentMediaElement(object);
     if (!mediaElement)
         return false;
 
     static Image* soundLevel3 = platformResource("mediaplayerSoundLevel3");
     static Image* soundLevel2 = platformResource("mediaplayerSoundLevel2");
     static Image* soundLevel1 = platformResource("mediaplayerSoundLevel1");
     static Image* soundLevel0 = platformResource("mediaplayerSoundLevel0");
     static Image* soundDisabled = platformResource("mediaplayerSoundDisabled");
 
     if (!hasSource(mediaElement) || !mediaElement->hasAudio())
         return paintMediaButton(paintInfo.context, rect, soundDisabled);
 
     if (mediaElement->muted() || mediaElement->volume() <= 0)
         return paintMediaButton(paintInfo.context, rect, soundLevel0);
 
     if (mediaElement->volume() <= 0.33)
         return paintMediaButton(paintInfo.context, rect, soundLevel1);
 
     if (mediaElement->volume() <= 0.66)
         return paintMediaButton(paintInfo.context, rect, soundLevel2);
 
     return paintMediaButton(paintInfo.context, rect, soundLevel3);
 }
 
-static bool paintMediaPlayButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaPlayButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     HTMLMediaElement* mediaElement = toParentMediaElement(object);
     if (!mediaElement)
         return false;
 
     static Image* mediaPlay = platformResource("mediaplayerPlay");
     static Image* mediaPause = platformResource("mediaplayerPause");
     static Image* mediaPlayDisabled = platformResource("mediaplayerPlayDisabled");
 
     if (!hasSource(mediaElement))
         return paintMediaButton(paintInfo.context, rect, mediaPlayDisabled);
 
     Image * image = !object->node()->isMediaControlElement() || mediaControlElementType(object->node()) == MediaPlayButton ? mediaPlay : mediaPause;
     return paintMediaButton(paintInfo.context, rect, image);
 }
 
-static bool paintMediaOverlayPlayButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaOverlayPlayButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     HTMLMediaElement* mediaElement = toParentMediaElement(object);
     if (!mediaElement)
         return false;
 
     if (!hasSource(mediaElement) || !mediaElement->togglePlayStateWillPlay())
         return false;
 
     static Image* mediaOverlayPlay = platformResource("mediaplayerOverlayPlay");
     return paintMediaButton(paintInfo.context, rect, mediaOverlayPlay);
@@ skipping 62 matching lines @@
     else if (endOffset < borderRadius)
         context->fillRoundedRect(highlightRect, IntSize(0, 0), radii, IntSize(0, 0), radii, startColor);
     else
         context->fillRect(highlightRect);
 
     context->restore();
 }
 
 const int mediaSliderThumbWidth = 32;
 
-static bool paintMediaSlider(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaSlider(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     HTMLMediaElement* mediaElement = toParentMediaElement(object);
     if (!mediaElement)
         return false;
 
     const RenderStyle& style = object->styleRef();
     GraphicsContext* context = paintInfo.context;
 
     paintRoundedSliderBackground(rect, style, context);
 
@@ skipping 31 matching lines @@
 
         if (endPosition > currentPosition)
             paintSliderRangeHighlight(rect, style, context, currentPosition, endPosition, startColor, endColor);
 
         return true;
     }
 
     return true;
 }
 
-static bool paintMediaSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaSliderThumb(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     if (!object->node())
         return false;
 
     HTMLMediaElement* mediaElement = toParentMediaElement(object->node()->shadowHost());
     if (!mediaElement)
         return false;
 
     if (!hasSource(mediaElement))
         return true;
 
     Image* mediaSliderThumb = getMediaSliderThumb();
     return paintMediaButton(paintInfo.context, rect, mediaSliderThumb);
 }
 
 const int mediaVolumeSliderThumbWidth = 24;
 
-static bool paintMediaVolumeSlider(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaVolumeSlider(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     HTMLMediaElement* mediaElement = toParentMediaElement(object);
     if (!mediaElement)
         return false;
 
     GraphicsContext* context = paintInfo.context;
     const RenderStyle& style = object->styleRef();
 
     paintRoundedSliderBackground(rect, style, context);
 
@@ skipping 16 matching lines @@
     }
 
     Color startColor = Color(195, 195, 195);
     Color endColor = Color(217, 217, 217);
 
     paintSliderRangeHighlight(rect, style, context, 0.0, fillWidth, startColor, endColor);
 
     return true;
 }
 
-static bool paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaVolumeSliderThumb(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     if (!object->node())
         return false;
 
     HTMLMediaElement* mediaElement = toParentMediaElement(object->node()->shadowHost());
     if (!mediaElement)
         return false;
 
     if (!hasSource(mediaElement) || !mediaElement->hasAudio())
         return true;
 
     static Image* mediaVolumeSliderThumb = platformResource("mediaplayerVolumeSliderThumb");
     return paintMediaButton(paintInfo.context, rect, mediaVolumeSliderThumb);
 }
 
-static bool paintMediaFullscreenButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaFullscreenButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     HTMLMediaElement* mediaElement = toParentMediaElement(object);
     if (!mediaElement)
         return false;
 
     static Image* mediaFullscreenButton = platformResource("mediaplayerFullscreen");
     return paintMediaButton(paintInfo.context, rect, mediaFullscreenButton);
 }
 
-static bool paintMediaToggleClosedCaptionsButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaToggleClosedCaptionsButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     HTMLMediaElement* mediaElement = toParentMediaElement(object);
     if (!mediaElement)
         return false;
 
     static Image* mediaClosedCaptionButton = platformResource("mediaplayerClosedCaption");
     static Image* mediaClosedCaptionButtonDisabled = platformResource("mediaplayerClosedCaptionDisabled");
 
     if (mediaElement->closedCaptionsVisible())
         return paintMediaButton(paintInfo.context, rect, mediaClosedCaptionButton);
 
     return paintMediaButton(paintInfo.context, rect, mediaClosedCaptionButtonDisabled);
 }
-static bool paintMediaCastButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaCastButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     HTMLMediaElement* mediaElement = toParentMediaElement(object);
     if (!mediaElement)
         return false;
 
     static Image* mediaCastOn = platformResource("mediaplayerCastOn");
     static Image* mediaCastOff = platformResource("mediaplayerCastOff");
     // To ensure that the overlaid cast button is visible when overlaid on pale videos we use a
     // different version of it for the overlaid case with a semi-opaque background.
     static Image* mediaOverlayCastOff = platformResource("mediaplayerOverlayCastOff");
 
     switch (mediaControlElementType(object->node())) {
     case MediaCastOnButton:
     case MediaOverlayCastOnButton:
         return paintMediaButton(paintInfo.context, rect, mediaCastOn);
     case MediaCastOffButton:
         return paintMediaButton(paintInfo.context, rect, mediaCastOff);
     case MediaOverlayCastOffButton:
         return paintMediaButton(paintInfo.context, rect, mediaOverlayCastOff);
     default:
         ASSERT_NOT_REACHED();
         return false;
     }
 }
 
-bool RenderMediaControls::paintMediaControlsPart(MediaControlElementType part, RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderMediaControls::paintMediaControlsPart(MediaControlElementType part, LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
 {
     switch (part) {
     case MediaMuteButton:
     case MediaUnMuteButton:
         return paintMediaMuteButton(object, paintInfo, rect);
     case MediaPauseButton:
     case MediaPlayButton:
         return paintMediaPlayButton(object, paintInfo, rect);
     case MediaShowClosedCaptionsButton:
         return paintMediaToggleClosedCaptionsButton(object, paintInfo, rect);
@@ skipping 88 matching lines @@
 {
     return formatChromiumMediaControlsTime(time, time);
 }
 
 String RenderMediaControls::formatMediaControlsCurrentTime(float currentTime, float duration)
 {
     return formatChromiumMediaControlsTime(currentTime, duration);
 }
 
 } // namespace blink