Modified: branches/subpixellayout/Source/WebCore/rendering/RenderTheme.cpp (112116 => 112117)
--- branches/subpixellayout/Source/WebCore/rendering/RenderTheme.cpp 2012-03-26 17:04:39 UTC (rev 112116)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderTheme.cpp 2012-03-26 17:16:28 UTC (rev 112117)
@@ -244,7 +244,7 @@
}
}
-bool RenderTheme::paint(RenderObject* o, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderTheme::paint(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
{
// If painting is disabled, but we aren't updating control tints, then just bail.
// If we are updating control tints, just schedule a repaint if the theme supports tinting
@@ -269,7 +269,7 @@
case DefaultButtonPart:
case ButtonPart:
case InnerSpinButtonPart:
- m_theme->paint(part, controlStatesForRenderer(o), const_cast<GraphicsContext*>(paintInfo.context), rect, o->style()->effectiveZoom(), o->view()->frameView());
+ m_theme->paint(part, controlStatesForRenderer(o), const_cast<GraphicsContext*>(paintInfo.context), r, o->style()->effectiveZoom(), o->view()->frameView());
return false;
default:
break;
@@ -280,95 +280,95 @@
switch (part) {
#if !USE(NEW_THEME)
case CheckboxPart:
- return paintCheckbox(o, paintInfo, rect);
+ return paintCheckbox(o, paintInfo, r);
case RadioPart:
- return paintRadio(o, paintInfo, rect);
+ return paintRadio(o, paintInfo, r);
case PushButtonPart:
case SquareButtonPart:
case ListButtonPart:
case DefaultButtonPart:
case ButtonPart:
- return paintButton(o, paintInfo, rect);
+ return paintButton(o, paintInfo, r);
case InnerSpinButtonPart:
- return paintInnerSpinButton(o, paintInfo, rect);
+ return paintInnerSpinButton(o, paintInfo, r);
#endif
case MenulistPart:
- return paintMenuList(o, paintInfo, rect);
+ return paintMenuList(o, paintInfo, r);
#if ENABLE(METER_TAG)
case MeterPart:
case RelevancyLevelIndicatorPart:
case ContinuousCapacityLevelIndicatorPart:
case DiscreteCapacityLevelIndicatorPart:
case RatingLevelIndicatorPart:
- return paintMeter(o, paintInfo, rect);
+ return paintMeter(o, paintInfo, r);
#endif
#if ENABLE(PROGRESS_TAG)
case ProgressBarPart:
- return paintProgressBar(o, paintInfo, rect);
+ return paintProgressBar(o, paintInfo, r);
#endif
case SliderHorizontalPart:
case SliderVerticalPart:
- return paintSliderTrack(o, paintInfo, rect);
+ return paintSliderTrack(o, paintInfo, r);
case SliderThumbHorizontalPart:
case SliderThumbVerticalPart:
- return paintSliderThumb(o, paintInfo, rect);
+ return paintSliderThumb(o, paintInfo, r);
case MediaEnterFullscreenButtonPart:
case MediaExitFullscreenButtonPart:
- return paintMediaFullscreenButton(o, paintInfo, rect);
+ return paintMediaFullscreenButton(o, paintInfo, r);
case MediaPlayButtonPart:
- return paintMediaPlayButton(o, paintInfo, rect);
+ return paintMediaPlayButton(o, paintInfo, r);
case MediaMuteButtonPart:
- return paintMediaMuteButton(o, paintInfo, rect);
+ return paintMediaMuteButton(o, paintInfo, r);
case MediaSeekBackButtonPart:
- return paintMediaSeekBackButton(o, paintInfo, rect);
+ return paintMediaSeekBackButton(o, paintInfo, r);
case MediaSeekForwardButtonPart:
- return paintMediaSeekForwardButton(o, paintInfo, rect);
+ return paintMediaSeekForwardButton(o, paintInfo, r);
case MediaRewindButtonPart:
- return paintMediaRewindButton(o, paintInfo, rect);
+ return paintMediaRewindButton(o, paintInfo, r);
case MediaReturnToRealtimeButtonPart:
- return paintMediaReturnToRealtimeButton(o, paintInfo, rect);
+ return paintMediaReturnToRealtimeButton(o, paintInfo, r);
case MediaToggleClosedCaptionsButtonPart:
- return paintMediaToggleClosedCaptionsButton(o, paintInfo, rect);
+ return paintMediaToggleClosedCaptionsButton(o, paintInfo, r);
case MediaSliderPart:
- return paintMediaSliderTrack(o, paintInfo, rect);
+ return paintMediaSliderTrack(o, paintInfo, r);
case MediaSliderThumbPart:
- return paintMediaSliderThumb(o, paintInfo, rect);
+ return paintMediaSliderThumb(o, paintInfo, r);
case MediaVolumeSliderMuteButtonPart:
- return paintMediaMuteButton(o, paintInfo, rect);
+ return paintMediaMuteButton(o, paintInfo, r);
case MediaVolumeSliderContainerPart:
- return paintMediaVolumeSliderContainer(o, paintInfo, rect);
+ return paintMediaVolumeSliderContainer(o, paintInfo, r);
case MediaVolumeSliderPart:
- return paintMediaVolumeSliderTrack(o, paintInfo, rect);
+ return paintMediaVolumeSliderTrack(o, paintInfo, r);
case MediaVolumeSliderThumbPart:
- return paintMediaVolumeSliderThumb(o, paintInfo, rect);
+ return paintMediaVolumeSliderThumb(o, paintInfo, r);
case MediaFullScreenVolumeSliderPart:
- return paintMediaFullScreenVolumeSliderTrack(o, paintInfo, rect);
+ return paintMediaFullScreenVolumeSliderTrack(o, paintInfo, r);
case MediaFullScreenVolumeSliderThumbPart:
- return paintMediaFullScreenVolumeSliderThumb(o, paintInfo, rect);
+ return paintMediaFullScreenVolumeSliderThumb(o, paintInfo, r);
case MediaTimeRemainingPart:
- return paintMediaTimeRemaining(o, paintInfo, rect);
+ return paintMediaTimeRemaining(o, paintInfo, r);
case MediaCurrentTimePart:
- return paintMediaCurrentTime(o, paintInfo, rect);
+ return paintMediaCurrentTime(o, paintInfo, r);
case MediaControlsBackgroundPart:
- return paintMediaControlsBackground(o, paintInfo, rect);
+ return paintMediaControlsBackground(o, paintInfo, r);
case MenulistButtonPart:
case TextFieldPart:
case TextAreaPart:
case ListboxPart:
return true;
case SearchFieldPart:
- return paintSearchField(o, paintInfo, rect);
+ return paintSearchField(o, paintInfo, r);
case SearchFieldCancelButtonPart:
- return paintSearchFieldCancelButton(o, paintInfo, rect);
+ return paintSearchFieldCancelButton(o, paintInfo, r);
case SearchFieldDecorationPart:
- return paintSearchFieldDecoration(o, paintInfo, rect);
+ return paintSearchFieldDecoration(o, paintInfo, r);
case SearchFieldResultsDecorationPart:
- return paintSearchFieldResultsDecoration(o, paintInfo, rect);
+ return paintSearchFieldResultsDecoration(o, paintInfo, r);
case SearchFieldResultsButtonPart:
- return paintSearchFieldResultsButton(o, paintInfo, rect);
+ return paintSearchFieldResultsButton(o, paintInfo, r);
#if ENABLE(INPUT_SPEECH)
case InputSpeechButtonPart:
- return paintInputFieldSpeechButton(o, paintInfo, rect);
+ return paintInputFieldSpeechButton(o, paintInfo, r);
#endif
default:
break;
