Skip to content

Commit

Permalink
Fix for https://bugs.webkit.org/show_bug.cgi?id=131044
Browse files Browse the repository at this point in the history 
The setPseudo call is done too early, because the constructor doesn't
initialize the object completely. Doing it after setting the type works
better.
  • Loading branch information
@pulkomandy
pulkomandy committed Apr 4, 2014
1 parent 088f9b0 commit 1a78100
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions Source/WebCore/html/shadow/MediaControlElements.cpp
View file
Expand Up @@ -449,7 +449,6 @@ MediaControlPanelMuteButtonElement::MediaControlPanelMuteButtonElement(Document&
: MediaControlMuteButtonElement(document, MediaMuteButton)
, m_controls(controls)
{
setPseudo(shadowPseudoId());
}

PassRefPtr<MediaControlPanelMuteButtonElement> MediaControlPanelMuteButtonElement::create(Document& document, MediaControls* controls)
Expand All @@ -459,6 +458,7 @@ PassRefPtr<MediaControlPanelMuteButtonElement> MediaControlPanelMuteButtonElemen
RefPtr<MediaControlPanelMuteButtonElement> button = adoptRef(new MediaControlPanelMuteButtonElement(document, controls));
button->ensureUserAgentShadowRoot();
button->setType("button");
button->setPseudo(button->shadowPseudoId());
return button.release();
}

Expand All @@ -481,14 +481,14 @@ const AtomicString& MediaControlPanelMuteButtonElement::shadowPseudoId() const
MediaControlVolumeSliderMuteButtonElement::MediaControlVolumeSliderMuteButtonElement(Document& document)
: MediaControlMuteButtonElement(document, MediaMuteButton)
{
setPseudo(shadowPseudoId());
}

PassRefPtr<MediaControlVolumeSliderMuteButtonElement> MediaControlVolumeSliderMuteButtonElement::create(Document& document)
{
RefPtr<MediaControlVolumeSliderMuteButtonElement> button = adoptRef(new MediaControlVolumeSliderMuteButtonElement(document));
button->ensureUserAgentShadowRoot();
button->setType("button");
button->setPseudo(button->shadowPseudoId());
return button.release();
}

Expand All @@ -503,14 +503,14 @@ const AtomicString& MediaControlVolumeSliderMuteButtonElement::shadowPseudoId()
MediaControlPlayButtonElement::MediaControlPlayButtonElement(Document& document)
: MediaControlInputElement(document, MediaPlayButton)
{
setPseudo(shadowPseudoId());
}

PassRefPtr<MediaControlPlayButtonElement> MediaControlPlayButtonElement::create(Document& document)
{
RefPtr<MediaControlPlayButtonElement> button = adoptRef(new MediaControlPlayButtonElement(document));
button->ensureUserAgentShadowRoot();
button->setType("button");
button->setPseudo(button->shadowPseudoId());
return button.release();
}

Expand Down Expand Up @@ -543,14 +543,14 @@ const AtomicString& MediaControlPlayButtonElement::shadowPseudoId() const
MediaControlOverlayPlayButtonElement::MediaControlOverlayPlayButtonElement(Document& document)
: MediaControlInputElement(document, MediaOverlayPlayButton)
{
setPseudo(shadowPseudoId());
}

PassRefPtr<MediaControlOverlayPlayButtonElement> MediaControlOverlayPlayButtonElement::create(Document& document)
{
RefPtr<MediaControlOverlayPlayButtonElement> button = adoptRef(new MediaControlOverlayPlayButtonElement(document));
button->ensureUserAgentShadowRoot();
button->setType("button");
button->setPseudo(button->shadowPseudoId());
return button.release();
}

Expand Down Expand Up @@ -584,14 +584,14 @@ const AtomicString& MediaControlOverlayPlayButtonElement::shadowPseudoId() const
MediaControlSeekForwardButtonElement::MediaControlSeekForwardButtonElement(Document& document)
: MediaControlSeekButtonElement(document, MediaSeekForwardButton)
{
setPseudo(shadowPseudoId());
}

PassRefPtr<MediaControlSeekForwardButtonElement> MediaControlSeekForwardButtonElement::create(Document& document)
{
RefPtr<MediaControlSeekForwardButtonElement> button = adoptRef(new MediaControlSeekForwardButtonElement(document));
button->ensureUserAgentShadowRoot();
button->setType("button");
button->setPseudo(button->shadowPseudoId());
return button.release();
}

Expand All @@ -606,14 +606,14 @@ const AtomicString& MediaControlSeekForwardButtonElement::shadowPseudoId() const
MediaControlSeekBackButtonElement::MediaControlSeekBackButtonElement(Document& document)
: MediaControlSeekButtonElement(document, MediaSeekBackButton)
{
setPseudo(shadowPseudoId());
}

PassRefPtr<MediaControlSeekBackButtonElement> MediaControlSeekBackButtonElement::create(Document& document)
{
RefPtr<MediaControlSeekBackButtonElement> button = adoptRef(new MediaControlSeekBackButtonElement(document));
button->ensureUserAgentShadowRoot();
button->setType("button");
button->setPseudo(button->shadowPseudoId());
return button.release();
}

Expand All @@ -628,14 +628,14 @@ const AtomicString& MediaControlSeekBackButtonElement::shadowPseudoId() const
MediaControlRewindButtonElement::MediaControlRewindButtonElement(Document& document)
: MediaControlInputElement(document, MediaRewindButton)
{
setPseudo(shadowPseudoId());
}

PassRefPtr<MediaControlRewindButtonElement> MediaControlRewindButtonElement::create(Document& document)
{
RefPtr<MediaControlRewindButtonElement> button = adoptRef(new MediaControlRewindButtonElement(document));
button->ensureUserAgentShadowRoot();
button->setType("button");
button->setPseudo(button->shadowPseudoId());
return button.release();
}

Expand All @@ -659,14 +659,14 @@ const AtomicString& MediaControlRewindButtonElement::shadowPseudoId() const
MediaControlReturnToRealtimeButtonElement::MediaControlReturnToRealtimeButtonElement(Document& document)
: MediaControlInputElement(document, MediaReturnToRealtimeButton)
{
setPseudo(shadowPseudoId());
}

PassRefPtr<MediaControlReturnToRealtimeButtonElement> MediaControlReturnToRealtimeButtonElement::create(Document& document)
{
RefPtr<MediaControlReturnToRealtimeButtonElement> button = adoptRef(new MediaControlReturnToRealtimeButtonElement(document));
button->ensureUserAgentShadowRoot();
button->setType("button");
button->setPseudo(button->shadowPseudoId());
button->hide();
return button.release();
}
Expand Down Expand Up @@ -697,7 +697,6 @@ MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsB
#if !PLATFORM(COCOA) && !PLATFORM(WIN) || !PLATFORM(GTK)
UNUSED_PARAM(controls);
#endif
setPseudo(shadowPseudoId());
}

PassRefPtr<MediaControlToggleClosedCaptionsButtonElement> MediaControlToggleClosedCaptionsButtonElement::create(Document& document, MediaControls* controls)
Expand All @@ -707,6 +706,7 @@ PassRefPtr<MediaControlToggleClosedCaptionsButtonElement> MediaControlToggleClos
RefPtr<MediaControlToggleClosedCaptionsButtonElement> button = adoptRef(new MediaControlToggleClosedCaptionsButtonElement(document, controls));
button->ensureUserAgentShadowRoot();
button->setType("button");
button->setPseudo(button->shadowPseudoId());
button->hide();
return button.release();
}
Expand Down Expand Up @@ -943,7 +943,6 @@ MediaControlTimelineElement::MediaControlTimelineElement(Document& document, Med
: MediaControlInputElement(document, MediaSlider)
, m_controls(controls)
{
setPseudo(shadowPseudoId());
}

PassRefPtr<MediaControlTimelineElement> MediaControlTimelineElement::create(Document& document, MediaControls* controls)
Expand All @@ -953,6 +952,7 @@ PassRefPtr<MediaControlTimelineElement> MediaControlTimelineElement::create(Docu
RefPtr<MediaControlTimelineElement> timeline = adoptRef(new MediaControlTimelineElement(document, controls));
timeline->ensureUserAgentShadowRoot();
timeline->setType("range");
timeline->setPseudo(timeline->shadowPseudoId());
timeline->setAttribute(precisionAttr, "float");
return timeline.release();
}
Expand Down Expand Up @@ -1018,14 +1018,14 @@ const AtomicString& MediaControlTimelineElement::shadowPseudoId() const
MediaControlPanelVolumeSliderElement::MediaControlPanelVolumeSliderElement(Document& document)
: MediaControlVolumeSliderElement(document)
{
setPseudo(shadowPseudoId());
}

PassRefPtr<MediaControlPanelVolumeSliderElement> MediaControlPanelVolumeSliderElement::create(Document& document)
{
RefPtr<MediaControlPanelVolumeSliderElement> slider = adoptRef(new MediaControlPanelVolumeSliderElement(document));
slider->ensureUserAgentShadowRoot();
slider->setType("range");
slider->setPseudo(slider->shadowPseudoId());
slider->setAttribute(precisionAttr, "float");
slider->setAttribute(maxAttr, "1");
return slider.release();
Expand All @@ -1042,14 +1042,14 @@ const AtomicString& MediaControlPanelVolumeSliderElement::shadowPseudoId() const
MediaControlFullscreenVolumeSliderElement::MediaControlFullscreenVolumeSliderElement(Document& document)
: MediaControlVolumeSliderElement(document)
{
setPseudo(shadowPseudoId());
}

PassRefPtr<MediaControlFullscreenVolumeSliderElement> MediaControlFullscreenVolumeSliderElement::create(Document& document)
{
RefPtr<MediaControlFullscreenVolumeSliderElement> slider = adoptRef(new MediaControlFullscreenVolumeSliderElement(document));
slider->ensureUserAgentShadowRoot();
slider->setType("range");
slider->setPseudo(slider->shadowPseudoId());
slider->setAttribute(precisionAttr, "float");
slider->setAttribute(maxAttr, "1");
return slider.release();
Expand All @@ -1066,14 +1066,14 @@ const AtomicString& MediaControlFullscreenVolumeSliderElement::shadowPseudoId()
MediaControlFullscreenButtonElement::MediaControlFullscreenButtonElement(Document& document)
: MediaControlInputElement(document, MediaEnterFullscreenButton)
{
setPseudo(shadowPseudoId());
}

PassRefPtr<MediaControlFullscreenButtonElement> MediaControlFullscreenButtonElement::create(Document& document)
{
RefPtr<MediaControlFullscreenButtonElement> button = adoptRef(new MediaControlFullscreenButtonElement(document));
button->ensureUserAgentShadowRoot();
button->setType("button");
button->setPseudo(button->shadowPseudoId());
button->hide();
return button.release();
}
Expand Down Expand Up @@ -1116,14 +1116,14 @@ void MediaControlFullscreenButtonElement::setIsFullscreen(bool isFullscreen)
MediaControlFullscreenVolumeMinButtonElement::MediaControlFullscreenVolumeMinButtonElement(Document& document)
: MediaControlInputElement(document, MediaUnMuteButton)
{
setPseudo(shadowPseudoId());
}

PassRefPtr<MediaControlFullscreenVolumeMinButtonElement> MediaControlFullscreenVolumeMinButtonElement::create(Document& document)
{
RefPtr<MediaControlFullscreenVolumeMinButtonElement> button = adoptRef(new MediaControlFullscreenVolumeMinButtonElement(document));
button->ensureUserAgentShadowRoot();
button->setType("button");
button->setPseudo(button->shadowPseudoId());
return button.release();
}

Expand All @@ -1148,14 +1148,14 @@ const AtomicString& MediaControlFullscreenVolumeMinButtonElement::shadowPseudoId
MediaControlFullscreenVolumeMaxButtonElement::MediaControlFullscreenVolumeMaxButtonElement(Document& document)
: MediaControlInputElement(document, MediaMuteButton)
{
setPseudo(shadowPseudoId());
}

PassRefPtr<MediaControlFullscreenVolumeMaxButtonElement> MediaControlFullscreenVolumeMaxButtonElement::create(Document& document)
{
RefPtr<MediaControlFullscreenVolumeMaxButtonElement> button = adoptRef(new MediaControlFullscreenVolumeMaxButtonElement(document));
button->ensureUserAgentShadowRoot();
button->setType("button");
button->setPseudo(button->shadowPseudoId());
return button.release();
}

Expand Down

0 comments on commit 1a78100

Please sign in to comment.