Changeset 171907 in webkit


Ignore:
Timestamp:
Jul 31, 2014, 8:42:47 PM (11 years ago)
Author:
benjamin@webkit.org
Message:

Remove shadowPseudoId() override from the shadow media controls
​https://bugs.webkit.org/show_bug.cgi?id=135474

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2014-07-31
Reviewed by Eric Carlson.

Small cleanup.

  • html/shadow/MediaControlElementTypes.h:
  • html/shadow/MediaControlElements.cpp:

(WebCore::MediaControlPanelElement::MediaControlPanelElement):
(WebCore::MediaControlPanelEnclosureElement::MediaControlPanelEnclosureElement):
(WebCore::MediaControlOverlayEnclosureElement::MediaControlOverlayEnclosureElement):
(WebCore::MediaControlTimelineContainerElement::MediaControlTimelineContainerElement):
(WebCore::MediaControlVolumeSliderContainerElement::MediaControlVolumeSliderContainerElement):
(WebCore::MediaControlStatusDisplayElement::MediaControlStatusDisplayElement):
(WebCore::MediaControlPanelMuteButtonElement::MediaControlPanelMuteButtonElement):
(WebCore::MediaControlVolumeSliderMuteButtonElement::MediaControlVolumeSliderMuteButtonElement):
(WebCore::MediaControlPlayButtonElement::MediaControlPlayButtonElement):
(WebCore::MediaControlOverlayPlayButtonElement::MediaControlOverlayPlayButtonElement):
(WebCore::MediaControlSeekForwardButtonElement::MediaControlSeekForwardButtonElement):
(WebCore::MediaControlSeekBackButtonElement::MediaControlSeekBackButtonElement):
(WebCore::MediaControlRewindButtonElement::MediaControlRewindButtonElement):
(WebCore::MediaControlReturnToRealtimeButtonElement::MediaControlReturnToRealtimeButtonElement):
(WebCore::MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement):
(WebCore::MediaControlClosedCaptionsContainerElement::MediaControlClosedCaptionsContainerElement):
(WebCore::MediaControlClosedCaptionsTrackListElement::MediaControlClosedCaptionsTrackListElement):
(WebCore::MediaControlTimelineElement::MediaControlTimelineElement):
(WebCore::MediaControlPanelVolumeSliderElement::MediaControlPanelVolumeSliderElement):
(WebCore::MediaControlFullscreenVolumeSliderElement::MediaControlFullscreenVolumeSliderElement):
(WebCore::MediaControlFullscreenButtonElement::MediaControlFullscreenButtonElement):
(WebCore::MediaControlFullscreenVolumeMinButtonElement::MediaControlFullscreenVolumeMinButtonElement):
(WebCore::MediaControlFullscreenVolumeMaxButtonElement::MediaControlFullscreenVolumeMaxButtonElement):
(WebCore::MediaControlTimeRemainingDisplayElement::MediaControlTimeRemainingDisplayElement):
(WebCore::MediaControlCurrentTimeDisplayElement::MediaControlCurrentTimeDisplayElement):
(WebCore::MediaControlTextTrackContainerElement::MediaControlTextTrackContainerElement):
(WebCore::MediaControlPanelElement::shadowPseudoId): Deleted.
(WebCore::MediaControlPanelEnclosureElement::shadowPseudoId): Deleted.
(WebCore::MediaControlOverlayEnclosureElement::shadowPseudoId): Deleted.
(WebCore::MediaControlTimelineContainerElement::shadowPseudoId): Deleted.
(WebCore::MediaControlVolumeSliderContainerElement::shadowPseudoId): Deleted.
(WebCore::MediaControlStatusDisplayElement::shadowPseudoId): Deleted.
(WebCore::MediaControlPanelMuteButtonElement::shadowPseudoId): Deleted.
(WebCore::MediaControlVolumeSliderMuteButtonElement::shadowPseudoId): Deleted.
(WebCore::MediaControlPlayButtonElement::shadowPseudoId): Deleted.
(WebCore::MediaControlOverlayPlayButtonElement::shadowPseudoId): Deleted.
(WebCore::MediaControlSeekForwardButtonElement::shadowPseudoId): Deleted.
(WebCore::MediaControlSeekBackButtonElement::shadowPseudoId): Deleted.
(WebCore::MediaControlRewindButtonElement::shadowPseudoId): Deleted.
(WebCore::MediaControlReturnToRealtimeButtonElement::shadowPseudoId): Deleted.
(WebCore::MediaControlToggleClosedCaptionsButtonElement::shadowPseudoId): Deleted.
(WebCore::MediaControlClosedCaptionsContainerElement::shadowPseudoId): Deleted.
(WebCore::MediaControlClosedCaptionsTrackListElement::shadowPseudoId): Deleted.
(WebCore::MediaControlTimelineElement::shadowPseudoId): Deleted.
(WebCore::MediaControlPanelVolumeSliderElement::shadowPseudoId): Deleted.
(WebCore::MediaControlFullscreenVolumeSliderElement::shadowPseudoId): Deleted.
(WebCore::MediaControlFullscreenButtonElement::shadowPseudoId): Deleted.
(WebCore::MediaControlFullscreenVolumeMinButtonElement::shadowPseudoId): Deleted.
(WebCore::MediaControlFullscreenVolumeMaxButtonElement::shadowPseudoId): Deleted.
(WebCore::MediaControlTimeRemainingDisplayElement::shadowPseudoId): Deleted.
(WebCore::MediaControlCurrentTimeDisplayElement::shadowPseudoId): Deleted.
(WebCore::MediaControlTextTrackContainerElement::textTrackContainerElementShadowPseudoId): Deleted.
(WebCore::MediaControlTextTrackContainerElement::shadowPseudoId): Deleted.

  • html/shadow/MediaControlElements.h:
  • html/shadow/MediaControls.cpp:

(WebCore::MediaControls::MediaControls):
(WebCore::MediaControls::shadowPseudoId): Deleted.

  • html/shadow/MediaControls.h:
Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r171905 r171907  
     12014-07-31  Benjamin Poulain  <bpoulain@apple.com>
     2
     3        Remove shadowPseudoId() override from the shadow media controls
     4        https://bugs.webkit.org/show_bug.cgi?id=135474
     5
     6        Reviewed by Eric Carlson.
     7
     8        Small cleanup.
     9
     10        * html/shadow/MediaControlElementTypes.h:
     11        * html/shadow/MediaControlElements.cpp:
     12        (WebCore::MediaControlPanelElement::MediaControlPanelElement):
     13        (WebCore::MediaControlPanelEnclosureElement::MediaControlPanelEnclosureElement):
     14        (WebCore::MediaControlOverlayEnclosureElement::MediaControlOverlayEnclosureElement):
     15        (WebCore::MediaControlTimelineContainerElement::MediaControlTimelineContainerElement):
     16        (WebCore::MediaControlVolumeSliderContainerElement::MediaControlVolumeSliderContainerElement):
     17        (WebCore::MediaControlStatusDisplayElement::MediaControlStatusDisplayElement):
     18        (WebCore::MediaControlPanelMuteButtonElement::MediaControlPanelMuteButtonElement):
     19        (WebCore::MediaControlVolumeSliderMuteButtonElement::MediaControlVolumeSliderMuteButtonElement):
     20        (WebCore::MediaControlPlayButtonElement::MediaControlPlayButtonElement):
     21        (WebCore::MediaControlOverlayPlayButtonElement::MediaControlOverlayPlayButtonElement):
     22        (WebCore::MediaControlSeekForwardButtonElement::MediaControlSeekForwardButtonElement):
     23        (WebCore::MediaControlSeekBackButtonElement::MediaControlSeekBackButtonElement):
     24        (WebCore::MediaControlRewindButtonElement::MediaControlRewindButtonElement):
     25        (WebCore::MediaControlReturnToRealtimeButtonElement::MediaControlReturnToRealtimeButtonElement):
     26        (WebCore::MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement):
     27        (WebCore::MediaControlClosedCaptionsContainerElement::MediaControlClosedCaptionsContainerElement):
     28        (WebCore::MediaControlClosedCaptionsTrackListElement::MediaControlClosedCaptionsTrackListElement):
     29        (WebCore::MediaControlTimelineElement::MediaControlTimelineElement):
     30        (WebCore::MediaControlPanelVolumeSliderElement::MediaControlPanelVolumeSliderElement):
     31        (WebCore::MediaControlFullscreenVolumeSliderElement::MediaControlFullscreenVolumeSliderElement):
     32        (WebCore::MediaControlFullscreenButtonElement::MediaControlFullscreenButtonElement):
     33        (WebCore::MediaControlFullscreenVolumeMinButtonElement::MediaControlFullscreenVolumeMinButtonElement):
     34        (WebCore::MediaControlFullscreenVolumeMaxButtonElement::MediaControlFullscreenVolumeMaxButtonElement):
     35        (WebCore::MediaControlTimeRemainingDisplayElement::MediaControlTimeRemainingDisplayElement):
     36        (WebCore::MediaControlCurrentTimeDisplayElement::MediaControlCurrentTimeDisplayElement):
     37        (WebCore::MediaControlTextTrackContainerElement::MediaControlTextTrackContainerElement):
     38        (WebCore::MediaControlPanelElement::shadowPseudoId): Deleted.
     39        (WebCore::MediaControlPanelEnclosureElement::shadowPseudoId): Deleted.
     40        (WebCore::MediaControlOverlayEnclosureElement::shadowPseudoId): Deleted.
     41        (WebCore::MediaControlTimelineContainerElement::shadowPseudoId): Deleted.
     42        (WebCore::MediaControlVolumeSliderContainerElement::shadowPseudoId): Deleted.
     43        (WebCore::MediaControlStatusDisplayElement::shadowPseudoId): Deleted.
     44        (WebCore::MediaControlPanelMuteButtonElement::shadowPseudoId): Deleted.
     45        (WebCore::MediaControlVolumeSliderMuteButtonElement::shadowPseudoId): Deleted.
     46        (WebCore::MediaControlPlayButtonElement::shadowPseudoId): Deleted.
     47        (WebCore::MediaControlOverlayPlayButtonElement::shadowPseudoId): Deleted.
     48        (WebCore::MediaControlSeekForwardButtonElement::shadowPseudoId): Deleted.
     49        (WebCore::MediaControlSeekBackButtonElement::shadowPseudoId): Deleted.
     50        (WebCore::MediaControlRewindButtonElement::shadowPseudoId): Deleted.
     51        (WebCore::MediaControlReturnToRealtimeButtonElement::shadowPseudoId): Deleted.
     52        (WebCore::MediaControlToggleClosedCaptionsButtonElement::shadowPseudoId): Deleted.
     53        (WebCore::MediaControlClosedCaptionsContainerElement::shadowPseudoId): Deleted.
     54        (WebCore::MediaControlClosedCaptionsTrackListElement::shadowPseudoId): Deleted.
     55        (WebCore::MediaControlTimelineElement::shadowPseudoId): Deleted.
     56        (WebCore::MediaControlPanelVolumeSliderElement::shadowPseudoId): Deleted.
     57        (WebCore::MediaControlFullscreenVolumeSliderElement::shadowPseudoId): Deleted.
     58        (WebCore::MediaControlFullscreenButtonElement::shadowPseudoId): Deleted.
     59        (WebCore::MediaControlFullscreenVolumeMinButtonElement::shadowPseudoId): Deleted.
     60        (WebCore::MediaControlFullscreenVolumeMaxButtonElement::shadowPseudoId): Deleted.
     61        (WebCore::MediaControlTimeRemainingDisplayElement::shadowPseudoId): Deleted.
     62        (WebCore::MediaControlCurrentTimeDisplayElement::shadowPseudoId): Deleted.
     63        (WebCore::MediaControlTextTrackContainerElement::textTrackContainerElementShadowPseudoId): Deleted.
     64        (WebCore::MediaControlTextTrackContainerElement::shadowPseudoId): Deleted.
     65        * html/shadow/MediaControlElements.h:
     66        * html/shadow/MediaControls.cpp:
     67        (WebCore::MediaControls::MediaControls):
     68        (WebCore::MediaControls::shadowPseudoId): Deleted.
     69        * html/shadow/MediaControls.h:
     70
    1712014-07-31  Timothy Horton  <timothy_horton@apple.com>
    272

  • trunk/Source/WebCore/html/shadow/MediaControlElementTypes.h

    r167755 r171907  
    8989
    9090    virtual MediaControlElementType displayType() { return m_displayType; }
    91     virtual const AtomicString& shadowPseudoId() const = 0;
    9291
    9392    virtual void setMediaController(MediaControllerInterface* controller) { m_mediaController = controller; }

  • trunk/Source/WebCore/html/shadow/MediaControlElements.cpp

    r171896 r171907  
    7676    , m_transitionTimer(this, &MediaControlPanelElement::transitionTimerFired)
    7777{
    78     setPseudo(shadowPseudoId());
     78    setPseudo(AtomicString("-webkit-media-controls-panel", AtomicString::ConstructFromLiteral));
    7979}
    8080
    … …  
    8282{
    8383    return adoptRef(new MediaControlPanelElement(document));
    84 }
    85 
    86 const AtomicString& MediaControlPanelElement::shadowPseudoId() const
    87 {
    88     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-panel", AtomicString::ConstructFromLiteral));
    89     return id;
    9084}
    9185
    … …  
    264258    : MediaControlDivElement(document, MediaControlsPanel)
    265259{
    266     setPseudo(shadowPseudoId());
     260    setPseudo(AtomicString("-webkit-media-controls-enclosure", AtomicString::ConstructFromLiteral));
    267261}
    268262
    … …  
    270264{
    271265    return adoptRef(new MediaControlPanelEnclosureElement(document));
    272 }
    273 
    274 const AtomicString& MediaControlPanelEnclosureElement::shadowPseudoId() const
    275 {
    276     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-enclosure", AtomicString::ConstructFromLiteral));
    277     return id;
    278266}
    279267
    … …  
    284272    : MediaControlDivElement(document, MediaControlsPanel)
    285273{
     274    setPseudo(AtomicString("-webkit-media-controls-overlay-enclosure", AtomicString::ConstructFromLiteral));
    286275}
    287276
    … …  
    289278{
    290279    return adoptRef(new MediaControlOverlayEnclosureElement(document));
    291 }
    292 
    293 const AtomicString& MediaControlOverlayEnclosureElement::shadowPseudoId() const
    294 {
    295     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-overlay-enclosure", AtomicString::ConstructFromLiteral));
    296     return id;
    297280}
    298281
    … …  
    302285    : MediaControlDivElement(document, MediaTimelineContainer)
    303286{
    304     setPseudo(shadowPseudoId());
     287    setPseudo(AtomicString("-webkit-media-controls-timeline-container", AtomicString::ConstructFromLiteral));
    305288}
    306289
    … …  
    310293    element->hide();
    311294    return element.release();
    312 }
    313 
    314 const AtomicString& MediaControlTimelineContainerElement::shadowPseudoId() const
    315 {
    316     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-timeline-container", AtomicString::ConstructFromLiteral));
    317     return id;
    318295}
    319296
    … …  
    347324    : MediaControlDivElement(document, MediaVolumeSliderContainer)
    348325{
    349     setPseudo(shadowPseudoId());
     326    setPseudo(AtomicString("-webkit-media-controls-volume-slider-container", AtomicString::ConstructFromLiteral));
    350327}
    351328
    … …  
    379356}
    380357
    381 const AtomicString& MediaControlVolumeSliderContainerElement::shadowPseudoId() const
    382 {
    383     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-volume-slider-container", AtomicString::ConstructFromLiteral));
    384     return id;
    385 }
    386 
    387358// ----------------------------
    388359
    … …  
    391362    , m_stateBeingDisplayed(Nothing)
    392363{
    393     setPseudo(shadowPseudoId());
     364    setPseudo(AtomicString("-webkit-media-controls-status-display", AtomicString::ConstructFromLiteral));
    394365}
    395366
    … …  
    434405}
    435406
    436 const AtomicString& MediaControlStatusDisplayElement::shadowPseudoId() const
    437 {
    438     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-status-display", AtomicString::ConstructFromLiteral));
    439     return id;
    440 }
    441 
    442 
    443407// ----------------------------
    444408
    … …  
    447411    , m_controls(controls)
    448412{
    449     setPseudo(shadowPseudoId());
     413    setPseudo(AtomicString("-webkit-media-controls-mute-button", AtomicString::ConstructFromLiteral));
    450414}
    451415
    … …  
    468432}
    469433
    470 const AtomicString& MediaControlPanelMuteButtonElement::shadowPseudoId() const
    471 {
    472     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-mute-button", AtomicString::ConstructFromLiteral));
    473     return id;
    474 }
    475 
    476434// ----------------------------
    477435
    … …  
    479437    : MediaControlMuteButtonElement(document, MediaMuteButton)
    480438{
    481     setPseudo(shadowPseudoId());
     439    setPseudo(AtomicString("-webkit-media-controls-volume-slider-mute-button", AtomicString::ConstructFromLiteral));
    482440}
    483441
    … …  
    490448}
    491449
    492 const AtomicString& MediaControlVolumeSliderMuteButtonElement::shadowPseudoId() const
    493 {
    494     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-volume-slider-mute-button", AtomicString::ConstructFromLiteral));
    495     return id;
    496 }
    497 
    498450// ----------------------------
    499451
    … …  
    501453    : MediaControlInputElement(document, MediaPlayButton)
    502454{
    503     setPseudo(shadowPseudoId());
     455    setPseudo(AtomicString("-webkit-media-controls-play-button", AtomicString::ConstructFromLiteral));
    504456}
    505457
    … …  
    530482}
    531483
    532 const AtomicString& MediaControlPlayButtonElement::shadowPseudoId() const
    533 {
    534     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-play-button", AtomicString::ConstructFromLiteral));
    535     return id;
    536 }
    537 
    538484// ----------------------------
    539485
    … …  
    541487    : MediaControlInputElement(document, MediaOverlayPlayButton)
    542488{
    543     setPseudo(shadowPseudoId());
     489    setPseudo(AtomicString("-webkit-media-controls-overlay-play-button", AtomicString::ConstructFromLiteral));
    544490}
    545491
    … …  
    570516}
    571517
    572 const AtomicString& MediaControlOverlayPlayButtonElement::shadowPseudoId() const
    573 {
    574     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-overlay-play-button", AtomicString::ConstructFromLiteral));
    575     return id;
    576 }
    577 
    578 
    579518// ----------------------------
    580519
    … …  
    582521    : MediaControlSeekButtonElement(document, MediaSeekForwardButton)
    583522{
    584     setPseudo(shadowPseudoId());
     523    setPseudo(AtomicString("-webkit-media-controls-seek-forward-button", AtomicString::ConstructFromLiteral));
    585524}
    586525
    … …  
    593532}
    594533
    595 const AtomicString& MediaControlSeekForwardButtonElement::shadowPseudoId() const
    596 {
    597     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-seek-forward-button", AtomicString::ConstructFromLiteral));
    598     return id;
    599 }
    600 
    601534// ----------------------------
    602535
    … …  
    604537    : MediaControlSeekButtonElement(document, MediaSeekBackButton)
    605538{
    606     setPseudo(shadowPseudoId());
     539    setPseudo(AtomicString("-webkit-media-controls-seek-back-button", AtomicString::ConstructFromLiteral));
    607540}
    608541
    … …  
    615548}
    616549
    617 const AtomicString& MediaControlSeekBackButtonElement::shadowPseudoId() const
    618 {
    619     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-seek-back-button", AtomicString::ConstructFromLiteral));
    620     return id;
    621 }
    622 
    623550// ----------------------------
    624551
    … …  
    626553    : MediaControlInputElement(document, MediaRewindButton)
    627554{
    628     setPseudo(shadowPseudoId());
     555    setPseudo(AtomicString("-webkit-media-controls-rewind-button", AtomicString::ConstructFromLiteral));
    629556}
    630557
    … …  
    646573}
    647574
    648 const AtomicString& MediaControlRewindButtonElement::shadowPseudoId() const
    649 {
    650     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-rewind-button", AtomicString::ConstructFromLiteral));
    651     return id;
    652 }
    653 
    654575// ----------------------------
    655576
    … …  
    657578    : MediaControlInputElement(document, MediaReturnToRealtimeButton)
    658579{
    659     setPseudo(shadowPseudoId());
     580    setPseudo(AtomicString("-webkit-media-controls-return-to-realtime-button", AtomicString::ConstructFromLiteral));
    660581}
    661582
    … …  
    678599}
    679600
    680 const AtomicString& MediaControlReturnToRealtimeButtonElement::shadowPseudoId() const
    681 {
    682     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-return-to-realtime-button", AtomicString::ConstructFromLiteral));
    683     return id;
    684 }
    685 
    686601// ----------------------------
    687602
    … …  
    695610    UNUSED_PARAM(controls);
    696611#endif
    697     setPseudo(shadowPseudoId());
     612    setPseudo(AtomicString("-webkit-media-controls-toggle-closed-captions-button", AtomicString::ConstructFromLiteral));
    698613}
    699614
    … …  
    736651}
    737652
    738 const AtomicString& MediaControlToggleClosedCaptionsButtonElement::shadowPseudoId() const
    739 {
    740     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-toggle-closed-captions-button", AtomicString::ConstructFromLiteral));
    741     return id;
    742 }
    743 
    744653// ----------------------------
    745654
    … …  
    747656    : MediaControlDivElement(document, MediaClosedCaptionsContainer)
    748657{
    749     setPseudo(shadowPseudoId());
     658    setPseudo(AtomicString("-webkit-media-controls-closed-captions-container", AtomicString::ConstructFromLiteral));
    750659}
    751660
    … …  
    756665    element->hide();
    757666    return element.release();
    758 }
    759 
    760 const AtomicString& MediaControlClosedCaptionsContainerElement::shadowPseudoId() const
    761 {
    762     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-closed-captions-container", AtomicString::ConstructFromLiteral));
    763     return id;
    764667}
    765668
    … …  
    775678    UNUSED_PARAM(controls);
    776679#endif
    777     setPseudo(shadowPseudoId());
     680    setPseudo(AtomicString("-webkit-media-controls-closed-captions-track-list", AtomicString::ConstructFromLiteral));
    778681}
    779682
    … …  
    822725}
    823726
    824 const AtomicString& MediaControlClosedCaptionsTrackListElement::shadowPseudoId() const
    825 {
    826     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-closed-captions-track-list", AtomicString::ConstructFromLiteral));
    827     return id;
    828 }
    829 
    830727void MediaControlClosedCaptionsTrackListElement::updateDisplay()
    831728{
    … …  
    941838    , m_controls(controls)
    942839{
    943     setPseudo(shadowPseudoId());
     840    setPseudo(AtomicString("-webkit-media-controls-timeline", AtomicString::ConstructFromLiteral));
    944841}
    945842
    … …  
    1004901}
    1005902
    1006 
    1007 const AtomicString& MediaControlTimelineElement::shadowPseudoId() const
    1008 {
    1009     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-timeline", AtomicString::ConstructFromLiteral));
    1010     return id;
    1011 }
    1012 
    1013903// ----------------------------
    1014904
    … …  
    1016906    : MediaControlVolumeSliderElement(document)
    1017907{
    1018     setPseudo(shadowPseudoId());
     908    setPseudo(AtomicString("-webkit-media-controls-volume-slider", AtomicString::ConstructFromLiteral));
    1019909}
    1020910
    … …  
    1029919}
    1030920
    1031 const AtomicString& MediaControlPanelVolumeSliderElement::shadowPseudoId() const
    1032 {
    1033     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-volume-slider", AtomicString::ConstructFromLiteral));
    1034     return id;
    1035 }
    1036 
    1037921// ----------------------------
    1038922
    … …  
    1040924    : MediaControlVolumeSliderElement(document)
    1041925{
    1042     setPseudo(shadowPseudoId());
     926    setPseudo(AtomicString("-webkit-media-controls-fullscreen-volume-slider", AtomicString::ConstructFromLiteral));
    1043927}
    1044928
    … …  
    1053937}
    1054938
    1055 const AtomicString& MediaControlFullscreenVolumeSliderElement::shadowPseudoId() const
    1056 {
    1057     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-volume-slider", AtomicString::ConstructFromLiteral));
    1058     return id;
    1059 }
    1060 
    1061939// ----------------------------
    1062940
    … …  
    1064942    : MediaControlInputElement(document, MediaEnterFullscreenButton)
    1065943{
    1066     setPseudo(shadowPseudoId());
     944    setPseudo(AtomicString("-webkit-media-controls-fullscreen-button", AtomicString::ConstructFromLiteral));
    1067945}
    1068946
    … …  
    1098976}
    1099977
    1100 const AtomicString& MediaControlFullscreenButtonElement::shadowPseudoId() const
    1101 {
    1102     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-button", AtomicString::ConstructFromLiteral));
    1103     return id;
    1104 }
    1105 
    1106978void MediaControlFullscreenButtonElement::setIsFullscreen(bool isFullscreen)
    1107979{
    … …  
    1114986    : MediaControlInputElement(document, MediaUnMuteButton)
    1115987{
    1116     setPseudo(shadowPseudoId());
     988    setPseudo(AtomicString("-webkit-media-controls-fullscreen-volume-min-button", AtomicString::ConstructFromLiteral));
    1117989}
    1118990
    … …  
    11351007}
    11361008
    1137 const AtomicString& MediaControlFullscreenVolumeMinButtonElement::shadowPseudoId() const
    1138 {
    1139     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-volume-min-button", AtomicString::ConstructFromLiteral));
    1140     return id;
    1141 }
    1142 
    11431009// ----------------------------
    11441010
    … …  
    11461012: MediaControlInputElement(document, MediaMuteButton)
    11471013{
    1148     setPseudo(shadowPseudoId());
     1014    setPseudo(AtomicString("-webkit-media-controls-fullscreen-volume-max-button", AtomicString::ConstructFromLiteral));
    11491015}
    11501016
    … …  
    11671033}
    11681034
    1169 const AtomicString& MediaControlFullscreenVolumeMaxButtonElement::shadowPseudoId() const
    1170 {
    1171     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-volume-max-button", AtomicString::ConstructFromLiteral));
    1172     return id;
    1173 }
    1174 
    11751035// ----------------------------
    11761036
    … …  
    11781038    : MediaControlTimeDisplayElement(document, MediaTimeRemainingDisplay)
    11791039{
    1180     setPseudo(shadowPseudoId());
     1040    setPseudo(getMediaControlTimeRemainingDisplayElementShadowPseudoId());
    11811041}
    11821042
    … …  
    11921052}
    11931053
    1194 const AtomicString& MediaControlTimeRemainingDisplayElement::shadowPseudoId() const
    1195 {
    1196     return getMediaControlTimeRemainingDisplayElementShadowPseudoId();
    1197 }
    1198 
    11991054// ----------------------------
    12001055
    … …  
    12021057    : MediaControlTimeDisplayElement(document, MediaCurrentTimeDisplay)
    12031058{
    1204     setPseudo(shadowPseudoId());
     1059    setPseudo(getMediaControlCurrentTimeDisplayElementShadowPseudoId());
    12051060}
    12061061
    … …  
    12141069    DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-current-time-display", AtomicString::ConstructFromLiteral));
    12151070    return id;
    1216 }
    1217 
    1218 const AtomicString& MediaControlCurrentTimeDisplayElement::shadowPseudoId() const
    1219 {
    1220     return getMediaControlCurrentTimeDisplayElementShadowPseudoId();
    12211071}
    12221072
    … …  
    12321082    , m_updateTextTrackRepresentationStyle(false)
    12331083{
    1234     setPseudo(shadowPseudoId());
     1084    setPseudo(AtomicString("-webkit-media-text-track-container", AtomicString::ConstructFromLiteral));
    12351085}
    12361086
    … …  
    12451095{
    12461096    return createRenderer<RenderTextTrackContainerElement>(*this, WTF::move(style));
    1247 }
    1248 
    1249 const AtomicString& MediaControlTextTrackContainerElement::textTrackContainerElementShadowPseudoId()
    1250 {
    1251     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-text-track-container", AtomicString::ConstructFromLiteral));
    1252     return id;
    1253 }
    1254    
    1255 const AtomicString& MediaControlTextTrackContainerElement::shadowPseudoId() const
    1256 {
    1257     return textTrackContainerElementShadowPseudoId();
    12581097}
    12591098

  • trunk/Source/WebCore/html/shadow/MediaControlElements.h

    r170920 r171907  
    5858    explicit MediaControlPanelElement(Document&);
    5959
    60     virtual const AtomicString& shadowPseudoId() const override;
    6160    virtual void defaultEventHandler(Event*) override;
    6261
    … …  
    8988private:
    9089    explicit MediaControlPanelEnclosureElement(Document&);
    91     virtual const AtomicString& shadowPseudoId() const override;
    9290};
    9391
    … …  
    10098private:
    10199    explicit MediaControlOverlayEnclosureElement(Document&);
    102     virtual const AtomicString& shadowPseudoId() const override;
    103100};
    104101
    … …  
    113110private:
    114111    explicit MediaControlTimelineContainerElement(Document&);
    115     virtual const AtomicString& shadowPseudoId() const override;
    116112
    117113    virtual RenderPtr<RenderElement> createElementRenderer(PassRef<RenderStyle>) override;
    … …  
    131127    explicit MediaControlVolumeSliderContainerElement(Document&);
    132128
    133     virtual const AtomicString& shadowPseudoId() const override;
    134129    virtual void defaultEventHandler(Event*) override;
    135130
    … …  
    147142private:
    148143    explicit MediaControlStatusDisplayElement(Document&);
    149     virtual const AtomicString& shadowPseudoId() const override;
    150144
    151145    enum StateBeingDisplayed { Nothing, Loading, LiveBroadcast };
    … …  
    166160    explicit MediaControlPanelMuteButtonElement(Document&, MediaControls*);
    167161
    168     virtual const AtomicString& shadowPseudoId() const override;
    169162    virtual void defaultEventHandler(Event*) override;
    170163
    … …  
    180173private:
    181174    explicit MediaControlVolumeSliderMuteButtonElement(Document&);
    182     virtual const AtomicString& shadowPseudoId() const override;
    183175};
    184176
    … …  
    199191    explicit MediaControlPlayButtonElement(Document&);
    200192
    201     virtual const AtomicString& shadowPseudoId() const override;
    202193    virtual void defaultEventHandler(Event*) override;
    203194};
    … …  
    214205    explicit MediaControlOverlayPlayButtonElement(Document&);
    215206
    216     virtual const AtomicString& shadowPseudoId() const override;
    217207    virtual void defaultEventHandler(Event*) override;
    218208};
    … …  
    226216private:
    227217    explicit MediaControlSeekForwardButtonElement(Document&);
    228     virtual const AtomicString& shadowPseudoId() const override;
    229218
    230219    virtual bool isForwardButton() const override { return true; }
    … …  
    239228private:
    240229    explicit MediaControlSeekBackButtonElement(Document&);
    241     virtual const AtomicString& shadowPseudoId() const override;
    242230
    243231    virtual bool isForwardButton() const override { return false; }
    … …  
    257245    explicit MediaControlRewindButtonElement(Document&);
    258246
    259     virtual const AtomicString& shadowPseudoId() const override;
    260247    virtual void defaultEventHandler(Event*) override;
    261248};
    … …  
    274261    explicit MediaControlReturnToRealtimeButtonElement(Document&);
    275262
    276     virtual const AtomicString& shadowPseudoId() const override;
    277263    virtual void defaultEventHandler(Event*) override;
    278264};
    … …  
    293279    explicit MediaControlToggleClosedCaptionsButtonElement(Document&, MediaControls*);
    294280
    295     virtual const AtomicString& shadowPseudoId() const override;
    296281    virtual void defaultEventHandler(Event*) override;
    297282
    … …  
    313298private:
    314299    MediaControlClosedCaptionsContainerElement(Document&);
    315     virtual const AtomicString& shadowPseudoId() const override;
    316300};
    317301
    … …  
    333317    void rebuildTrackListMenu();
    334318
    335     virtual const AtomicString& shadowPseudoId() const override;
    336319    virtual void defaultEventHandler(Event*) override;
    337320
    … …  
    361344    explicit MediaControlTimelineElement(Document&, MediaControls*);
    362345
    363     virtual const AtomicString& shadowPseudoId() const override;
    364346    virtual void defaultEventHandler(Event*) override;
    365347
    … …  
    382364    explicit MediaControlFullscreenButtonElement(Document&);
    383365
    384     virtual const AtomicString& shadowPseudoId() const override;
    385366    virtual void defaultEventHandler(Event*) override;
    386367};
    … …  
    394375private:
    395376    explicit MediaControlPanelVolumeSliderElement(Document&);
    396     virtual const AtomicString& shadowPseudoId() const override;
    397377};
    398378// ----------------------------
    … …  
    404384private:
    405385    explicit MediaControlFullscreenVolumeSliderElement(Document&);
    406     virtual const AtomicString& shadowPseudoId() const override;
    407386};
    408387
    … …  
    419398private:
    420399    explicit MediaControlFullscreenVolumeMinButtonElement(Document&);
    421     virtual const AtomicString& shadowPseudoId() const override;
    422400    virtual void defaultEventHandler(Event*) override;
    423401};
    … …  
    436414    explicit MediaControlFullscreenVolumeMaxButtonElement(Document&);
    437415
    438     virtual const AtomicString& shadowPseudoId() const override;
    439416    virtual void defaultEventHandler(Event*) override;
    440417};
    … …  
    449426private:
    450427    explicit MediaControlTimeRemainingDisplayElement(Document&);
    451     virtual const AtomicString& shadowPseudoId() const override;
    452428};
    453429
    … …  
    460436private:
    461437    explicit MediaControlCurrentTimeDisplayElement(Document&);
    462     virtual const AtomicString& shadowPseudoId() const override;
    463438};
    464439
    … …  
    475450    void enteredFullscreen();
    476451    void exitedFullscreen();
    477     static const AtomicString& textTrackContainerElementShadowPseudoId();
    478452
    479453private:
    … …  
    482456
    483457    explicit MediaControlTextTrackContainerElement(Document&);
    484     virtual const AtomicString& shadowPseudoId() const override;
    485458
    486459    virtual RenderPtr<RenderElement> createElementRenderer(PassRef<RenderStyle>) override;

  • trunk/Source/WebCore/html/shadow/MediaControls.cpp

    r165676 r171907  
    5353    , m_isMouseOverControls(false)
    5454{
     55    setPseudo(AtomicString("-webkit-media-controls", AtomicString::ConstructFromLiteral));
    5556}
    5657
    … …  
    364365}
    365366
    366 const AtomicString& MediaControls::shadowPseudoId() const
    367 {
    368     DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls"));
    369     return id;
    370 }
    371 
    372367bool MediaControls::containsRelatedTarget(Event* event)
    373368{

  • trunk/Source/WebCore/html/shadow/MediaControls.h

    r165676 r171907  
    144144private:
    145145    virtual bool isMediaControls() const override { return true; }
    146 
    147     virtual const AtomicString& shadowPseudoId() const override;
    148146};
    149147
Note: See TracChangeset for help on using the changeset viewer.