Diff
Modified: trunk/Source/WebCore/ChangeLog (188165 => 188166)
--- trunk/Source/WebCore/ChangeLog 2015-08-07 21:37:40 UTC (rev 188165)
+++ trunk/Source/WebCore/ChangeLog 2015-08-07 21:44:56 UTC (rev 188166)
@@ -1,5 +1,23 @@
2015-08-07 Zalan Bujtas <[email protected]>
+ RenderTheme::volumeSliderOffsetFromMuteButton should take const& RenderBox.
+ https://bugs.webkit.org/show_bug.cgi?id=147731
+
+ Reviewed by Simon Fraser.
+
+ No change in functionality.
+
+ * rendering/RenderMediaControlElements.cpp:
+ (WebCore::RenderMediaVolumeSliderContainer::layout):
+ * rendering/RenderMediaControls.cpp:
+ (WebCore::RenderMediaControls::volumeSliderOffsetFromMuteButton): Deleted.
+ * rendering/RenderMediaControls.h:
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::volumeSliderOffsetFromMuteButton):
+ * rendering/RenderTheme.h:
+
+2015-08-07 Zalan Bujtas <[email protected]>
+
Replace RenderObject::isRooted() logic with isDescendantOf().
https://bugs.webkit.org/show_bug.cgi?id=147788
Modified: trunk/Source/WebCore/rendering/RenderMediaControlElements.cpp (188165 => 188166)
--- trunk/Source/WebCore/rendering/RenderMediaControlElements.cpp 2015-08-07 21:37:40 UTC (rev 188165)
+++ trunk/Source/WebCore/rendering/RenderMediaControlElements.cpp 2015-08-07 21:44:56 UTC (rev 188166)
@@ -54,7 +54,7 @@
// If the slider would be rendered outside the page, it should be moved below the controls.
if (UNLIKELY(absoluteOffsetTop < 0))
- setY(buttonBox.offsetTop() + theme().volumeSliderOffsetFromMuteButton(&buttonBox, pixelSnappedSize()).y());
+ setY(buttonBox.offsetTop() + theme().volumeSliderOffsetFromMuteButton(buttonBox, pixelSnappedSize()).y());
}
// ----------------------------
Modified: trunk/Source/WebCore/rendering/RenderMediaControls.cpp (188165 => 188166)
--- trunk/Source/WebCore/rendering/RenderMediaControls.cpp 2015-08-07 21:37:40 UTC (rev 188165)
+++ trunk/Source/WebCore/rendering/RenderMediaControls.cpp 2015-08-07 21:44:56 UTC (rev 188166)
@@ -220,19 +220,6 @@
#endif
-IntPoint RenderMediaControls::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonBox, const IntSize& size)
-{
- static const int xOffset = -4;
- static const int yOffset = 5;
-
- float zoomLevel = muteButtonBox->style().effectiveZoom();
- int y = yOffset * zoomLevel + muteButtonBox->pixelSnappedOffsetHeight() - size.height();
- FloatPoint absPoint = muteButtonBox->localToAbsolute(FloatPoint(muteButtonBox->pixelSnappedOffsetLeft(), y), IsFixed | UseTransforms);
- if (absPoint.y() < 0)
- y = muteButtonBox->pixelSnappedSize().height();
- return IntPoint(xOffset * zoomLevel, y);
}
-}
-
#endif
Modified: trunk/Source/WebCore/rendering/RenderMediaControls.h (188165 => 188166)
--- trunk/Source/WebCore/rendering/RenderMediaControls.h 2015-08-07 21:37:40 UTC (rev 188165)
+++ trunk/Source/WebCore/rendering/RenderMediaControls.h 2015-08-07 21:44:56 UTC (rev 188166)
@@ -48,7 +48,6 @@
static bool paintMediaControlsPart(MediaControlElementType, const RenderObject&, const PaintInfo&, const IntRect&);
static void adjustMediaSliderThumbSize(RenderStyle&);
#endif
- static IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&);
};
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (188165 => 188166)
--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2015-08-07 21:37:40 UTC (rev 188165)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2015-08-07 21:44:56 UTC (rev 188166)
@@ -552,12 +552,12 @@
return formatMediaControlsTime(currentTime - duration);
}
-IntPoint RenderTheme::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonBox, const IntSize& size) const
+IntPoint RenderTheme::volumeSliderOffsetFromMuteButton(const RenderBox& muteButtonBox, const IntSize& size) const
{
int y = -size.height();
- FloatPoint absPoint = muteButtonBox->localToAbsolute(FloatPoint(muteButtonBox->pixelSnappedOffsetLeft(), y), IsFixed | UseTransforms);
+ FloatPoint absPoint = muteButtonBox.localToAbsolute(FloatPoint(muteButtonBox.pixelSnappedOffsetLeft(), y), IsFixed | UseTransforms);
if (absPoint.y() < 0)
- y = muteButtonBox->height();
+ y = muteButtonBox.height();
return IntPoint(0, y);
}
Modified: trunk/Source/WebCore/rendering/RenderTheme.h (188165 => 188166)
--- trunk/Source/WebCore/rendering/RenderTheme.h 2015-08-07 21:37:40 UTC (rev 188165)
+++ trunk/Source/WebCore/rendering/RenderTheme.h 2015-08-07 21:44:56 UTC (rev 188166)
@@ -209,7 +209,7 @@
virtual String formatMediaControlsRemainingTime(float currentTime, float duration) const;
// Returns the media volume slider container's offset from the mute button.
- virtual IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&) const;
+ virtual IntPoint volumeSliderOffsetFromMuteButton(const RenderBox&, const IntSize&) const;
#endif
#if ENABLE(METER_ELEMENT)
