Diff
Modified: branches/subpixellayout/Source/WebCore/html/shadow/MediaControlElements.cpp (112080 => 112081)
--- branches/subpixellayout/Source/WebCore/html/shadow/MediaControlElements.cpp 2012-03-26 12:42:44 UTC (rev 112080)
+++ branches/subpixellayout/Source/WebCore/html/shadow/MediaControlElements.cpp 2012-03-26 12:58:29 UTC (rev 112081)
@@ -339,7 +339,7 @@
LayoutStateDisabler layoutStateDisabler(view());
- LayoutPoint offset = theme()->volumeSliderOffsetFromMuteButton(buttonBox, size());
+ IntPoint offset = theme()->volumeSliderOffsetFromMuteButton(buttonBox, pixelSnappedSize());
setX(offset.x() + buttonBox->offsetLeft());
setY(offset.y() + buttonBox->offsetTop());
}
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderBox.cpp (112080 => 112081)
--- branches/subpixellayout/Source/WebCore/rendering/RenderBox.cpp 2012-03-26 12:42:44 UTC (rev 112080)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderBox.cpp 2012-03-26 12:58:29 UTC (rev 112081)
@@ -1000,17 +1000,18 @@
// If we have a native theme appearance, paint that before painting our background.
// The theme will tell us whether or not we should also paint the CSS background.
- bool themePainted = style()->hasAppearance() && !theme()->paint(this, paintInfo, paintRect);
+ IntRect snappedPaintRect(pixelSnappedIntRect(paintRect));
+ bool themePainted = style()->hasAppearance() && !theme()->paint(this, paintInfo, snappedPaintRect);
if (!themePainted) {
paintBackground(paintInfo, paintRect, bleedAvoidance);
if (style()->hasAppearance())
- theme()->paintDecorations(this, paintInfo, pixelSnappedIntRect(paintRect));
+ theme()->paintDecorations(this, paintInfo, snappedPaintRect);
}
paintBoxShadow(paintInfo, paintRect, style(), Inset);
// The theme will tell us whether or not we should also paint the CSS border.
- if ((!style()->hasAppearance() || (!themePainted && theme()->paintBorderOnly(this, paintInfo, pixelSnappedIntRect(paintRect)))) && style()->hasBorder())
+ if ((!style()->hasAppearance() || (!themePainted && theme()->paintBorderOnly(this, paintInfo, snappedPaintRect))) && style()->hasBorder())
paintBorder(paintInfo, paintRect, style(), bleedAvoidance);
if (bleedAvoidance == BackgroundBleedUseTransparencyLayer)
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderBox.h (112080 => 112081)
--- branches/subpixellayout/Source/WebCore/rendering/RenderBox.h 2012-03-26 12:42:44 UTC (rev 112080)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderBox.h 2012-03-26 12:58:29 UTC (rev 112081)
@@ -122,6 +122,7 @@
LayoutPoint location() const { return m_frameRect.location(); }
LayoutSize locationOffset() const { return LayoutSize(x(), y()); }
LayoutSize size() const { return m_frameRect.size(); }
+ IntSize pixelSnappedSize() const { return m_frameRect.pixelSnappedSize(); }
void setLocation(const LayoutPoint& location) { m_frameRect.setLocation(location); }
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderMediaControls.cpp (112080 => 112081)
--- branches/subpixellayout/Source/WebCore/rendering/RenderMediaControls.cpp 2012-03-26 12:42:44 UTC (rev 112080)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderMediaControls.cpp 2012-03-26 12:58:29 UTC (rev 112081)
@@ -206,17 +206,17 @@
#endif
-LayoutPoint RenderMediaControls::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonBox, const LayoutSize& size)
+IntPoint RenderMediaControls::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonBox, const IntSize& size)
{
static const int xOffset = -4;
static const int yOffset = 5;
float zoomLevel = muteButtonBox->style()->effectiveZoom();
- LayoutUnit y = yOffset * zoomLevel + muteButtonBox->offsetHeight() - size.height();
- FloatPoint absPoint = muteButtonBox->localToAbsolute(FloatPoint(muteButtonBox->offsetLeft(), y), true, true);
+ int y = yOffset * zoomLevel + muteButtonBox->pixelSnappedOffsetHeight() - size.height();
+ FloatPoint absPoint = muteButtonBox->localToAbsolute(FloatPoint(muteButtonBox->pixelSnappedOffsetLeft(), y), true, true);
if (absPoint.y() < 0)
- y = muteButtonBox->height();
- return LayoutPoint(xOffset * zoomLevel, y);
+ y = muteButtonBox->pixelSnappedHeight();
+ return IntPoint(xOffset * zoomLevel, y);
}
}
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderMediaControls.h (112080 => 112081)
--- branches/subpixellayout/Source/WebCore/rendering/RenderMediaControls.h 2012-03-26 12:42:44 UTC (rev 112080)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderMediaControls.h 2012-03-26 12:58:29 UTC (rev 112081)
@@ -42,7 +42,7 @@
static bool paintMediaControlsPart(MediaControlElementType, RenderObject*, const PaintInfo&, const IntRect&);
static void adjustMediaSliderThumbSize(RenderStyle*);
#endif
- static LayoutPoint volumeSliderOffsetFromMuteButton(RenderBox*, const LayoutSize&);
+ static IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&);
};
} // namespace WebCore
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderMeter.cpp (112080 => 112081)
--- branches/subpixellayout/Source/WebCore/rendering/RenderMeter.cpp 2012-03-26 12:42:44 UTC (rev 112080)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderMeter.cpp 2012-03-26 12:58:29 UTC (rev 112081)
@@ -46,13 +46,13 @@
void RenderMeter::computeLogicalWidth()
{
RenderBox::computeLogicalWidth();
- setWidth(theme()->meterSizeForBounds(this, frameRect()).width());
+ setWidth(theme()->meterSizeForBounds(this, pixelSnappedIntRect(frameRect())).width());
}
void RenderMeter::computeLogicalHeight()
{
RenderBox::computeLogicalHeight();
- setHeight(theme()->meterSizeForBounds(this, frameRect()).height());
+ setHeight(theme()->meterSizeForBounds(this, pixelSnappedIntRect(frameRect())).height());
}
double RenderMeter::valueRatio() const
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderTheme.cpp (112080 => 112081)
--- branches/subpixellayout/Source/WebCore/rendering/RenderTheme.cpp 2012-03-26 12:42:44 UTC (rev 112080)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderTheme.cpp 2012-03-26 12:58:29 UTC (rev 112081)
@@ -244,7 +244,7 @@
}
}
-bool RenderTheme::paint(RenderObject* o, const PaintInfo& paintInfo, const LayoutRect& rect)
+bool RenderTheme::paint(RenderObject* o, const PaintInfo& paintInfo, const IntRect& rect)
{
// 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
@@ -259,8 +259,6 @@
ControlPart part = o->style()->appearance();
- IntRect r = enclosingIntRect(rect);
-
#if USE(NEW_THEME)
switch (part) {
case CheckboxPart:
@@ -271,7 +269,7 @@
case DefaultButtonPart:
case ButtonPart:
case InnerSpinButtonPart:
- m_theme->paint(part, controlStatesForRenderer(o), const_cast<GraphicsContext*>(paintInfo.context), r, o->style()->effectiveZoom(), o->view()->frameView());
+ m_theme->paint(part, controlStatesForRenderer(o), const_cast<GraphicsContext*>(paintInfo.context), rect, o->style()->effectiveZoom(), o->view()->frameView());
return false;
default:
break;
@@ -282,95 +280,95 @@
switch (part) {
#if !USE(NEW_THEME)
case CheckboxPart:
- return paintCheckbox(o, paintInfo, r);
+ return paintCheckbox(o, paintInfo, rect);
case RadioPart:
- return paintRadio(o, paintInfo, r);
+ return paintRadio(o, paintInfo, rect);
case PushButtonPart:
case SquareButtonPart:
case ListButtonPart:
case DefaultButtonPart:
case ButtonPart:
- return paintButton(o, paintInfo, r);
+ return paintButton(o, paintInfo, rect);
case InnerSpinButtonPart:
- return paintInnerSpinButton(o, paintInfo, r);
+ return paintInnerSpinButton(o, paintInfo, rect);
#endif
case MenulistPart:
- return paintMenuList(o, paintInfo, r);
+ return paintMenuList(o, paintInfo, rect);
#if ENABLE(METER_TAG)
case MeterPart:
case RelevancyLevelIndicatorPart:
case ContinuousCapacityLevelIndicatorPart:
case DiscreteCapacityLevelIndicatorPart:
case RatingLevelIndicatorPart:
- return paintMeter(o, paintInfo, r);
+ return paintMeter(o, paintInfo, rect);
#endif
#if ENABLE(PROGRESS_TAG)
case ProgressBarPart:
- return paintProgressBar(o, paintInfo, r);
+ return paintProgressBar(o, paintInfo, rect);
#endif
case SliderHorizontalPart:
case SliderVerticalPart:
- return paintSliderTrack(o, paintInfo, r);
+ return paintSliderTrack(o, paintInfo, rect);
case SliderThumbHorizontalPart:
case SliderThumbVerticalPart:
- return paintSliderThumb(o, paintInfo, r);
+ return paintSliderThumb(o, paintInfo, rect);
case MediaEnterFullscreenButtonPart:
case MediaExitFullscreenButtonPart:
- return paintMediaFullscreenButton(o, paintInfo, r);
+ return paintMediaFullscreenButton(o, paintInfo, rect);
case MediaPlayButtonPart:
- return paintMediaPlayButton(o, paintInfo, r);
+ return paintMediaPlayButton(o, paintInfo, rect);
case MediaMuteButtonPart:
- return paintMediaMuteButton(o, paintInfo, r);
+ return paintMediaMuteButton(o, paintInfo, rect);
case MediaSeekBackButtonPart:
- return paintMediaSeekBackButton(o, paintInfo, r);
+ return paintMediaSeekBackButton(o, paintInfo, rect);
case MediaSeekForwardButtonPart:
- return paintMediaSeekForwardButton(o, paintInfo, r);
+ return paintMediaSeekForwardButton(o, paintInfo, rect);
case MediaRewindButtonPart:
- return paintMediaRewindButton(o, paintInfo, r);
+ return paintMediaRewindButton(o, paintInfo, rect);
case MediaReturnToRealtimeButtonPart:
- return paintMediaReturnToRealtimeButton(o, paintInfo, r);
+ return paintMediaReturnToRealtimeButton(o, paintInfo, rect);
case MediaToggleClosedCaptionsButtonPart:
- return paintMediaToggleClosedCaptionsButton(o, paintInfo, r);
+ return paintMediaToggleClosedCaptionsButton(o, paintInfo, rect);
case MediaSliderPart:
- return paintMediaSliderTrack(o, paintInfo, r);
+ return paintMediaSliderTrack(o, paintInfo, rect);
case MediaSliderThumbPart:
- return paintMediaSliderThumb(o, paintInfo, r);
+ return paintMediaSliderThumb(o, paintInfo, rect);
case MediaVolumeSliderMuteButtonPart:
- return paintMediaMuteButton(o, paintInfo, r);
+ return paintMediaMuteButton(o, paintInfo, rect);
case MediaVolumeSliderContainerPart:
- return paintMediaVolumeSliderContainer(o, paintInfo, r);
+ return paintMediaVolumeSliderContainer(o, paintInfo, rect);
case MediaVolumeSliderPart:
- return paintMediaVolumeSliderTrack(o, paintInfo, r);
+ return paintMediaVolumeSliderTrack(o, paintInfo, rect);
case MediaVolumeSliderThumbPart:
- return paintMediaVolumeSliderThumb(o, paintInfo, r);
+ return paintMediaVolumeSliderThumb(o, paintInfo, rect);
case MediaFullScreenVolumeSliderPart:
- return paintMediaFullScreenVolumeSliderTrack(o, paintInfo, r);
+ return paintMediaFullScreenVolumeSliderTrack(o, paintInfo, rect);
case MediaFullScreenVolumeSliderThumbPart:
- return paintMediaFullScreenVolumeSliderThumb(o, paintInfo, r);
+ return paintMediaFullScreenVolumeSliderThumb(o, paintInfo, rect);
case MediaTimeRemainingPart:
- return paintMediaTimeRemaining(o, paintInfo, r);
+ return paintMediaTimeRemaining(o, paintInfo, rect);
case MediaCurrentTimePart:
- return paintMediaCurrentTime(o, paintInfo, r);
+ return paintMediaCurrentTime(o, paintInfo, rect);
case MediaControlsBackgroundPart:
- return paintMediaControlsBackground(o, paintInfo, r);
+ return paintMediaControlsBackground(o, paintInfo, rect);
case MenulistButtonPart:
case TextFieldPart:
case TextAreaPart:
case ListboxPart:
return true;
case SearchFieldPart:
- return paintSearchField(o, paintInfo, r);
+ return paintSearchField(o, paintInfo, rect);
case SearchFieldCancelButtonPart:
- return paintSearchFieldCancelButton(o, paintInfo, r);
+ return paintSearchFieldCancelButton(o, paintInfo, rect);
case SearchFieldDecorationPart:
- return paintSearchFieldDecoration(o, paintInfo, r);
+ return paintSearchFieldDecoration(o, paintInfo, rect);
case SearchFieldResultsDecorationPart:
- return paintSearchFieldResultsDecoration(o, paintInfo, r);
+ return paintSearchFieldResultsDecoration(o, paintInfo, rect);
case SearchFieldResultsButtonPart:
- return paintSearchFieldResultsButton(o, paintInfo, r);
+ return paintSearchFieldResultsButton(o, paintInfo, rect);
#if ENABLE(INPUT_SPEECH)
case InputSpeechButtonPart:
- return paintInputFieldSpeechButton(o, paintInfo, r);
+ return paintInputFieldSpeechButton(o, paintInfo, rect);
#endif
default:
break;
@@ -509,13 +507,13 @@
return formatMediaControlsTime(currentTime - duration);
}
-LayoutPoint RenderTheme::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonBox, const LayoutSize& size) const
+IntPoint RenderTheme::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonBox, const IntSize& size) const
{
- LayoutUnit y = -size.height();
+ int y = -size.height();
FloatPoint absPoint = muteButtonBox->localToAbsolute(FloatPoint(muteButtonBox->pixelSnappedOffsetLeft(), y), true, true);
if (absPoint.y() < 0)
y = muteButtonBox->height();
- return LayoutPoint(0, y);
+ return IntPoint(0, y);
}
#endif
@@ -928,9 +926,9 @@
style->setBoxShadow(nullptr);
}
-LayoutSize RenderTheme::meterSizeForBounds(const RenderMeter*, const LayoutRect& bounds) const
+IntSize RenderTheme::meterSizeForBounds(const RenderMeter*, const IntRect& bounds) const
{
- return roundedLayoutSize(bounds.size());
+ return bounds.size();
}
bool RenderTheme::supportsMeter(ControlPart) const
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderTheme.h (112080 => 112081)
--- branches/subpixellayout/Source/WebCore/rendering/RenderTheme.h 2012-03-26 12:42:44 UTC (rev 112080)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderTheme.h 2012-03-26 12:58:29 UTC (rev 112081)
@@ -77,7 +77,7 @@
// This method is called to paint the widget as a background of the RenderObject. A widget's foreground, e.g., the
// text of a button, is always rendered by the engine itself. The boolean return value indicates
// whether the CSS border/background should also be painted.
- bool paint(RenderObject*, const PaintInfo&, const LayoutRect&);
+ bool paint(RenderObject*, const PaintInfo&, const IntRect&);
bool paintBorderOnly(RenderObject*, const PaintInfo&, const IntRect&);
bool paintDecorations(RenderObject*, const PaintInfo&, const IntRect&);
@@ -177,7 +177,7 @@
virtual ScrollbarControlSize scrollbarControlSizeForPart(ControlPart) { return RegularScrollbar; }
// Method for painting the caps lock indicator
- virtual bool paintCapsLockIndicator(RenderObject*, const PaintInfo&, const LayoutRect&) { return 0; };
+ virtual bool paintCapsLockIndicator(RenderObject*, const PaintInfo&, const IntRect&) { return 0; };
#if ENABLE(PROGRESS_TAG)
// Returns the repeat interval of the animation for the progress bar.
@@ -199,11 +199,11 @@
virtual String formatMediaControlsRemainingTime(float currentTime, float duration) const;
// Returns the media volume slider container's offset from the mute button.
- virtual LayoutPoint volumeSliderOffsetFromMuteButton(RenderBox*, const LayoutSize&) const;
+ virtual IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&) const;
#endif
#if ENABLE(METER_TAG)
- virtual LayoutSize meterSizeForBounds(const RenderMeter*, const LayoutRect&) const;
+ virtual IntSize meterSizeForBounds(const RenderMeter*, const IntRect&) const;
virtual bool supportsMeter(ControlPart) const;
#endif
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderThemeMac.h (112080 => 112081)
--- branches/subpixellayout/Source/WebCore/rendering/RenderThemeMac.h 2012-03-26 12:42:44 UTC (rev 112080)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderThemeMac.h 2012-03-26 12:58:29 UTC (rev 112081)
@@ -79,7 +79,7 @@
virtual bool popsMenuByArrowKeys() const OVERRIDE { return true; }
#if ENABLE(METER_TAG)
- virtual LayoutSize meterSizeForBounds(const RenderMeter*, const LayoutRect&) const;
+ virtual IntSize meterSizeForBounds(const RenderMeter*, const IntRect&) const;
virtual bool paintMeter(RenderObject*, const PaintInfo&, const IntRect&);
virtual bool supportsMeter(ControlPart) const;
#endif
@@ -171,7 +171,7 @@
virtual bool usesMediaControlStatusDisplay();
virtual bool usesMediaControlVolumeSlider() const;
virtual void adjustMediaSliderThumbSize(RenderStyle*) const;
- virtual LayoutPoint volumeSliderOffsetFromMuteButton(RenderBox*, const LayoutSize&) const;
+ virtual IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&) const;
#endif
virtual bool shouldShowPlaceholderWhenFocused() const;
@@ -186,7 +186,7 @@
// Get the control size based off the font. Used by some of the controls (like buttons).
NSControlSize controlSizeForFont(RenderStyle*) const;
NSControlSize controlSizeForSystemFont(RenderStyle*) const;
- void setControlSize(NSCell*, const IntSize* sizes, const LayoutSize& minSize, float zoomLevel = 1.0f);
+ void setControlSize(NSCell*, const IntSize* sizes, const IntSize& minSize, float zoomLevel = 1.0f);
void setSizeFromFont(RenderStyle*, const IntSize* sizes) const;
IntSize sizeForFont(RenderStyle*, const IntSize* sizes) const;
IntSize sizeForSystemFont(RenderStyle*, const IntSize* sizes) const;
@@ -201,7 +201,7 @@
// Helpers for adjusting appearance and for painting
- void setPopupButtonCellState(const RenderObject*, const LayoutRect&);
+ void setPopupButtonCellState(const RenderObject*, const IntRect&);
const IntSize* popupButtonSizes() const;
const int* popupButtonMargins() const;
const int* popupButtonPadding(NSControlSize) const;
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderThemeMac.mm (112080 => 112081)
--- branches/subpixellayout/Source/WebCore/rendering/RenderThemeMac.mm 2012-03-26 12:42:44 UTC (rev 112080)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderThemeMac.mm 2012-03-26 12:58:29 UTC (rev 112081)
@@ -640,14 +640,14 @@
return NSMiniControlSize;
}
-void RenderThemeMac::setControlSize(NSCell* cell, const IntSize* sizes, const LayoutSize& minSize, float zoomLevel)
+void RenderThemeMac::setControlSize(NSCell* cell, const IntSize* sizes, const IntSize& minSize, float zoomLevel)
{
NSControlSize size;
- if (minSize.width() >= static_cast<LayoutUnit>(sizes[NSRegularControlSize].width() * zoomLevel) &&
- minSize.height() >= static_cast<LayoutUnit>(sizes[NSRegularControlSize].height() * zoomLevel))
+ if (minSize.width() >= static_cast<int>(sizes[NSRegularControlSize].width() * zoomLevel) &&
+ minSize.height() >= static_cast<int>(sizes[NSRegularControlSize].height() * zoomLevel))
size = NSRegularControlSize;
- else if (minSize.width() >= static_cast<LayoutUnit>(sizes[NSSmallControlSize].width() * zoomLevel) &&
- minSize.height() >= static_cast<LayoutUnit>(sizes[NSSmallControlSize].height() * zoomLevel))
+ else if (minSize.width() >= static_cast<int>(sizes[NSSmallControlSize].width() * zoomLevel) &&
+ minSize.height() >= static_cast<int>(sizes[NSSmallControlSize].height() * zoomLevel))
size = NSSmallControlSize;
else
size = NSMiniControlSize;
@@ -818,16 +818,16 @@
#if ENABLE(METER_TAG)
-LayoutSize RenderThemeMac::meterSizeForBounds(const RenderMeter* renderMeter, const LayoutRect& bounds) const
+IntSize RenderThemeMac::meterSizeForBounds(const RenderMeter* renderMeter, const IntRect& bounds) const
{
if (NoControlPart == renderMeter->style()->appearance())
return bounds.size();
NSLevelIndicatorCell* cell = levelIndicatorFor(renderMeter);
// Makes enough room for cell's intrinsic size.
- NSSize cellSize = [cell cellSizeForBounds:pixelSnappedIntRect(LayoutPoint(), bounds.size())];
- return LayoutSize(bounds.width() < static_cast<LayoutUnit>(cellSize.width) ? static_cast<LayoutUnit>(cellSize.width) : bounds.width(),
- bounds.height() < static_cast<LayoutUnit>(cellSize.height) ? static_cast<LayoutUnit>(cellSize.height) : bounds.height());
+ 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 RenderThemeMac::paintMeter(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
@@ -1277,7 +1277,7 @@
style->setLineHeight(RenderStyle::initialLineHeight());
}
-void RenderThemeMac::setPopupButtonCellState(const RenderObject* o, const LayoutRect& r)
+void RenderThemeMac::setPopupButtonCellState(const RenderObject* o, const IntRect& r)
{
NSPopUpButtonCell* popupButton = this->popupButton();
@@ -1539,9 +1539,9 @@
#if ENABLE(INPUT_SPEECH)
// Take care of cases where the cancel button was not aligned with the right border of the input element (for e.g.
// when speech input is enabled for the input element.
- LayoutRect absBoundingBox = input->renderer()->absoluteBoundingBoxRect();
- LayoutUnit absRight = absBoundingBox.x() + absBoundingBox.width() - input->renderBox()->paddingRight() - input->renderBox()->borderRight();
- LayoutUnit spaceToRightOfCancelButton = absRight - (r.x() + r.width());
+ IntRect absBoundingBox = input->renderer()->absoluteBoundingBoxRect();
+ int absRight = absBoundingBox.x() + absBoundingBox.width() - input->renderBox()->paddingRight() - input->renderBox()->borderRight();
+ int spaceToRightOfCancelButton = absRight - (r.x() + r.width());
localBounds.setX(localBounds.x() - spaceToRightOfCancelButton);
#endif
@@ -2059,7 +2059,7 @@
return mediaControllerTheme() == MediaControllerThemeQuickTime;
}
-LayoutPoint RenderThemeMac::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonBox, const LayoutSize& size) const
+IntPoint RenderThemeMac::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonBox, const IntSize& size) const
{
return RenderMediaControls::volumeSliderOffsetFromMuteButton(muteButtonBox, size);
}
