Implement interfaces in PaintInfo and make it a class.

Source/core/rendering/RenderMediaControlsChromium.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 47 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(RenderObject* object, 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);
+        return paintMediaButton(paintInfo.getContext(), rect, soundDisabled);
 
     if (mediaElement->muted() || mediaElement->volume() <= 0)
-        return paintMediaButton(paintInfo.context, rect, soundLevel0);
+        return paintMediaButton(paintInfo.getContext(), rect, soundLevel0);
 
     if (mediaElement->volume() <= 0.33)
-        return paintMediaButton(paintInfo.context, rect, soundLevel1);
+        return paintMediaButton(paintInfo.getContext(), rect, soundLevel1);
 
     if (mediaElement->volume() <= 0.66)
-        return paintMediaButton(paintInfo.context, rect, soundLevel2);
+        return paintMediaButton(paintInfo.getContext(), rect, soundLevel2);
 
-    return paintMediaButton(paintInfo.context, rect, soundLevel3);
+    return paintMediaButton(paintInfo.getContext(), rect, soundLevel3);
 }
 
-static bool paintMediaPlayButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaPlayButton(RenderObject* object, 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);
+        return paintMediaButton(paintInfo.getContext(), rect, mediaPlayDisabled);
 
-    return paintMediaButton(paintInfo.context, rect, mediaElement->canPlay() ? mediaPlay : mediaPause);
+    return paintMediaButton(paintInfo.getContext(), rect, mediaElement->canPlay() ? mediaPlay : mediaPause);
 }
 
-static bool paintMediaOverlayPlayButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaOverlayPlayButton(RenderObject* object, PaintInfo& paintInfo, const IntRect& rect)
 {
     HTMLMediaElement* mediaElement = toParentMediaElement(object);
     if (!mediaElement)
         return false;
 
     if (!hasSource(mediaElement) || !mediaElement->canPlay())
         return false;
 
     static Image* mediaOverlayPlay = platformResource("mediaplayerOverlayPlay");
-    return paintMediaButton(paintInfo.context, rect, mediaOverlayPlay);
+    return paintMediaButton(paintInfo.getContext(), rect, mediaOverlayPlay);
 }
 
 static Image* getMediaSliderThumb()
 {
     static Image* mediaSliderThumb = platformResource("mediaplayerSliderThumb");
     return mediaSliderThumb;
 }
 
 static void paintRoundedSliderBackground(const IntRect& rect, const RenderStyle* style, GraphicsContext* context)
 {
@@ skipping 56 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(RenderObject* object, PaintInfo& paintInfo, const IntRect& rect)
 {
     HTMLMediaElement* mediaElement = toParentMediaElement(object);
     if (!mediaElement)
         return false;
 
     RenderStyle* style = object->style();
-    GraphicsContext* context = paintInfo.context;
+    GraphicsContext* context = paintInfo.getContext();
 
     paintRoundedSliderBackground(rect, style, context);
 
     // Draw the buffered range. Since the element may have multiple buffered ranges and it'd be
     // distracting/'busy' to show all of them, show only the buffered range containing the current play head.
     RefPtr<TimeRanges> bufferedTimeRanges = mediaElement->buffered();
     float duration = mediaElement->duration();
     float currentTime = mediaElement->currentTime();
     if (std::isnan(duration) || std::isinf(duration) || !duration || std::isnan(currentTime))
         return true;
@@ skipping 24 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(RenderObject* object, PaintInfo& paintInfo, const IntRect& rect)
 {
     ASSERT(object->node());
     HTMLMediaElement* mediaElement = toParentMediaElement(object->node()->shadowHost());
     if (!mediaElement)
         return false;
 
     if (!hasSource(mediaElement))
         return true;
 
     Image* mediaSliderThumb = getMediaSliderThumb();
-    return paintMediaButton(paintInfo.context, rect, mediaSliderThumb);
+    return paintMediaButton(paintInfo.getContext(), rect, mediaSliderThumb);
 }
 
 const int mediaVolumeSliderThumbWidth = 24;
 
-static bool paintMediaVolumeSlider(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaVolumeSlider(RenderObject* object, PaintInfo& paintInfo, const IntRect& rect)
 {
     HTMLMediaElement* mediaElement = toParentMediaElement(object);
     if (!mediaElement)
         return false;
 
-    GraphicsContext* context = paintInfo.context;
+    GraphicsContext* context = paintInfo.getContext();
     RenderStyle* style = object->style();
 
     paintRoundedSliderBackground(rect, style, context);
 
     // Calculate volume position for white background rectangle.
     float volume = mediaElement->volume();
     if (std::isnan(volume) || volume < 0)
         return true;
     if (volume > 1)
         volume = 1;
@@ skipping 10 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(RenderObject* object, PaintInfo& paintInfo, const IntRect& rect)
 {
     ASSERT(object->node());
     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);
+    return paintMediaButton(paintInfo.getContext(), rect, mediaVolumeSliderThumb);
 }
 
-static bool paintMediaFullscreenButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaFullscreenButton(RenderObject* object, PaintInfo& paintInfo, const IntRect& rect)
 {
     HTMLMediaElement* mediaElement = toParentMediaElement(object);
     if (!mediaElement)
         return false;
 
     static Image* mediaFullscreenButton = platformResource("mediaplayerFullscreen");
-    return paintMediaButton(paintInfo.context, rect, mediaFullscreenButton);
+    return paintMediaButton(paintInfo.getContext(), rect, mediaFullscreenButton);
 }
 
-static bool paintMediaToggleClosedCaptionsButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaToggleClosedCaptionsButton(RenderObject* object, 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->webkitClosedCaptionsVisible())
-        return paintMediaButton(paintInfo.context, rect, mediaClosedCaptionButton);
+        return paintMediaButton(paintInfo.getContext(), rect, mediaClosedCaptionButton);
 
-    return paintMediaButton(paintInfo.context, rect, mediaClosedCaptionButtonDisabled);
+    return paintMediaButton(paintInfo.getContext(), rect, mediaClosedCaptionButtonDisabled);
 }
 
 
-bool RenderMediaControlsChromium::paintMediaControlsPart(MediaControlElementType part, RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderMediaControlsChromium::paintMediaControlsPart(MediaControlElementType part, RenderObject* object, 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 RenderMediaControlsChromium::formatMediaControlsCurrentTime(float currentTime, float duration)
 {
     return formatChromiumMediaControlsTime(currentTime, duration);
 }
 
 } // namespace WebCore