diff options
Diffstat (limited to 'Source/WebCore/rendering/RenderMediaControlElements.cpp')
-rw-r--r-- | Source/WebCore/rendering/RenderMediaControlElements.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Source/WebCore/rendering/RenderMediaControlElements.cpp b/Source/WebCore/rendering/RenderMediaControlElements.cpp index 7de982a7e..c5f7bb7bd 100644 --- a/Source/WebCore/rendering/RenderMediaControlElements.cpp +++ b/Source/WebCore/rendering/RenderMediaControlElements.cpp @@ -35,8 +35,8 @@ namespace WebCore { -RenderMediaVolumeSliderContainer::RenderMediaVolumeSliderContainer(Element& element, PassRef<RenderStyle> style) - : RenderBlockFlow(element, std::move(style)) +RenderMediaVolumeSliderContainer::RenderMediaVolumeSliderContainer(Element& element, RenderStyle&& style) + : RenderBlockFlow(element, WTFMove(style)) { } @@ -44,23 +44,23 @@ void RenderMediaVolumeSliderContainer::layout() { RenderBlockFlow::layout(); - if (style().display() == NONE || !nextSibling() || !nextSibling()->isBox()) + if (style().display() == NONE || !is<RenderBox>(nextSibling())) return; - RenderBox* buttonBox = toRenderBox(nextSibling()); - int absoluteOffsetTop = buttonBox->localToAbsolute(FloatPoint(0, -size().height())).y(); + RenderBox& buttonBox = downcast<RenderBox>(*nextSibling()); + int absoluteOffsetTop = buttonBox.localToAbsolute(FloatPoint(0, -size().height())).y(); - LayoutStateDisabler layoutStateDisabler(&view()); + LayoutStateDisabler layoutStateDisabler(view()); // 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, size()).y()); } // ---------------------------- -RenderMediaControlTimelineContainer::RenderMediaControlTimelineContainer(Element& element, PassRef<RenderStyle> style) - : RenderFlexibleBox(element, std::move(style)) +RenderMediaControlTimelineContainer::RenderMediaControlTimelineContainer(Element& element, RenderStyle&& style) + : RenderFlexibleBox(element, WTFMove(style)) { } @@ -72,7 +72,7 @@ void RenderMediaControlTimelineContainer::layout() { RenderFlexibleBox::layout(); - LayoutStateDisabler layoutStateDisabler(&view()); + LayoutStateDisabler layoutStateDisabler(view()); MediaControlTimelineContainerElement* container = static_cast<MediaControlTimelineContainerElement*>(element()); container->setTimeDisplaysHidden(width().toInt() < minWidthToDisplayTimeDisplays); } @@ -81,8 +81,8 @@ void RenderMediaControlTimelineContainer::layout() #if ENABLE(VIDEO_TRACK) -RenderTextTrackContainerElement::RenderTextTrackContainerElement(Element& element, PassRef<RenderStyle> style) - : RenderBlockFlow(element, std::move(style)) +RenderTextTrackContainerElement::RenderTextTrackContainerElement(Element& element, RenderStyle&& style) + : RenderBlockFlow(element, WTFMove(style)) { } @@ -94,7 +94,7 @@ void RenderTextTrackContainerElement::layout() ASSERT(mediaControlElementType(element()) == MediaTextTrackDisplayContainer); - LayoutStateDisabler layoutStateDisabler(&view()); + LayoutStateDisabler layoutStateDisabler(view()); static_cast<MediaControlTextTrackContainerElement*>(element())->updateSizes(); } |