<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[171907] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/171907">171907</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-31 20:42:47 -0700 (Thu, 31 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementTypesh">trunk/Source/WebCore/html/shadow/MediaControlElementTypes.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementscpp">trunk/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementsh">trunk/Source/WebCore/html/shadow/MediaControlElements.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlscpp">trunk/Source/WebCore/html/shadow/MediaControls.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlsh">trunk/Source/WebCore/html/shadow/MediaControls.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171906 => 171907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-01 02:20:48 UTC (rev 171906)
+++ trunk/Source/WebCore/ChangeLog 2014-08-01 03:42:47 UTC (rev 171907)
</span><span class="lines">@@ -1,3 +1,73 @@
</span><ins>+2014-07-31 Benjamin Poulain <bpoulain@apple.com>
+
+ Remove shadowPseudoId() override from the shadow media controls
+ https://bugs.webkit.org/show_bug.cgi?id=135474
+
+ 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:
+
</ins><span class="cx"> 2014-07-31 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix for platforms where we should have automaticallyAdjustsContentInsets but it isn't public yet
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElementTypes.h (171906 => 171907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElementTypes.h 2014-08-01 02:20:48 UTC (rev 171906)
+++ trunk/Source/WebCore/html/shadow/MediaControlElementTypes.h 2014-08-01 03:42:47 UTC (rev 171907)
</span><span class="lines">@@ -88,7 +88,6 @@
</span><span class="cx"> virtual bool isShowing() const;
</span><span class="cx">
</span><span class="cx"> virtual MediaControlElementType displayType() { return m_displayType; }
</span><del>- virtual const AtomicString& shadowPseudoId() const = 0;
</del><span class="cx">
</span><span class="cx"> virtual void setMediaController(MediaControllerInterface* controller) { m_mediaController = controller; }
</span><span class="cx"> virtual MediaControllerInterface* mediaController() const { return m_mediaController; }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (171906 => 171907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2014-08-01 02:20:48 UTC (rev 171906)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2014-08-01 03:42:47 UTC (rev 171907)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> , m_opaque(true)
</span><span class="cx"> , m_transitionTimer(this, &MediaControlPanelElement::transitionTimerFired)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-panel", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlPanelElement> MediaControlPanelElement::create(Document& document)
</span><span class="lines">@@ -83,12 +83,6 @@
</span><span class="cx"> return adoptRef(new MediaControlPanelElement(document));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlPanelElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-panel", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> void MediaControlPanelElement::startDrag(const LayoutPoint& eventLocation)
</span><span class="cx"> {
</span><span class="cx"> if (!m_canBeDragged)
</span><span class="lines">@@ -263,7 +257,7 @@
</span><span class="cx"> // Mapping onto same MediaControlElementType as panel element, since it has similar properties.
</span><span class="cx"> : MediaControlDivElement(document, MediaControlsPanel)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-enclosure", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlPanelEnclosureElement> MediaControlPanelEnclosureElement::create(Document& document)
</span><span class="lines">@@ -271,18 +265,13 @@
</span><span class="cx"> return adoptRef(new MediaControlPanelEnclosureElement(document));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlPanelEnclosureElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-enclosure", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlOverlayEnclosureElement::MediaControlOverlayEnclosureElement(Document& document)
</span><span class="cx"> // Mapping onto same MediaControlElementType as panel element, since it has similar properties.
</span><span class="cx"> : MediaControlDivElement(document, MediaControlsPanel)
</span><span class="cx"> {
</span><ins>+ setPseudo(AtomicString("-webkit-media-controls-overlay-enclosure", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlOverlayEnclosureElement> MediaControlOverlayEnclosureElement::create(Document& document)
</span><span class="lines">@@ -290,18 +279,12 @@
</span><span class="cx"> return adoptRef(new MediaControlOverlayEnclosureElement(document));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlOverlayEnclosureElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-overlay-enclosure", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlTimelineContainerElement::MediaControlTimelineContainerElement(Document& document)
</span><span class="cx"> : MediaControlDivElement(document, MediaTimelineContainer)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-timeline-container", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlTimelineContainerElement> MediaControlTimelineContainerElement::create(Document& document)
</span><span class="lines">@@ -311,12 +294,6 @@
</span><span class="cx"> return element.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlTimelineContainerElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-timeline-container", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> void MediaControlTimelineContainerElement::setTimeDisplaysHidden(bool hidden)
</span><span class="cx"> {
</span><span class="cx"> for (unsigned i = 0; i < childNodeCount(); ++i) {
</span><span class="lines">@@ -346,7 +323,7 @@
</span><span class="cx"> MediaControlVolumeSliderContainerElement::MediaControlVolumeSliderContainerElement(Document& document)
</span><span class="cx"> : MediaControlDivElement(document, MediaVolumeSliderContainer)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-volume-slider-container", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlVolumeSliderContainerElement> MediaControlVolumeSliderContainerElement::create(Document& document)
</span><span class="lines">@@ -378,19 +355,13 @@
</span><span class="cx"> hide();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlVolumeSliderContainerElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-volume-slider-container", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlStatusDisplayElement::MediaControlStatusDisplayElement(Document& document)
</span><span class="cx"> : MediaControlDivElement(document, MediaStatusDisplay)
</span><span class="cx"> , m_stateBeingDisplayed(Nothing)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-status-display", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlStatusDisplayElement> MediaControlStatusDisplayElement::create(Document& document)
</span><span class="lines">@@ -433,20 +404,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlStatusDisplayElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-status-display", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlPanelMuteButtonElement::MediaControlPanelMuteButtonElement(Document& document, MediaControls* controls)
</span><span class="cx"> : MediaControlMuteButtonElement(document, MediaMuteButton)
</span><span class="cx"> , m_controls(controls)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-mute-button", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlPanelMuteButtonElement> MediaControlPanelMuteButtonElement::create(Document& document, MediaControls* controls)
</span><span class="lines">@@ -467,18 +431,12 @@
</span><span class="cx"> MediaControlMuteButtonElement::defaultEventHandler(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlPanelMuteButtonElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-mute-button", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlVolumeSliderMuteButtonElement::MediaControlVolumeSliderMuteButtonElement(Document& document)
</span><span class="cx"> : MediaControlMuteButtonElement(document, MediaMuteButton)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-volume-slider-mute-button", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlVolumeSliderMuteButtonElement> MediaControlVolumeSliderMuteButtonElement::create(Document& document)
</span><span class="lines">@@ -489,18 +447,12 @@
</span><span class="cx"> return button.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlVolumeSliderMuteButtonElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-volume-slider-mute-button", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlPlayButtonElement::MediaControlPlayButtonElement(Document& document)
</span><span class="cx"> : MediaControlInputElement(document, MediaPlayButton)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-play-button", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlPlayButtonElement> MediaControlPlayButtonElement::create(Document& document)
</span><span class="lines">@@ -529,18 +481,12 @@
</span><span class="cx"> setDisplayType(mediaController()->canPlay() ? MediaPlayButton : MediaPauseButton);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlPlayButtonElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-play-button", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlOverlayPlayButtonElement::MediaControlOverlayPlayButtonElement(Document& document)
</span><span class="cx"> : MediaControlInputElement(document, MediaOverlayPlayButton)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-overlay-play-button", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlOverlayPlayButtonElement> MediaControlOverlayPlayButtonElement::create(Document& document)
</span><span class="lines">@@ -569,19 +515,12 @@
</span><span class="cx"> hide();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlOverlayPlayButtonElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-overlay-play-button", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlSeekForwardButtonElement::MediaControlSeekForwardButtonElement(Document& document)
</span><span class="cx"> : MediaControlSeekButtonElement(document, MediaSeekForwardButton)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-seek-forward-button", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlSeekForwardButtonElement> MediaControlSeekForwardButtonElement::create(Document& document)
</span><span class="lines">@@ -592,18 +531,12 @@
</span><span class="cx"> return button.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlSeekForwardButtonElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-seek-forward-button", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlSeekBackButtonElement::MediaControlSeekBackButtonElement(Document& document)
</span><span class="cx"> : MediaControlSeekButtonElement(document, MediaSeekBackButton)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-seek-back-button", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlSeekBackButtonElement> MediaControlSeekBackButtonElement::create(Document& document)
</span><span class="lines">@@ -614,18 +547,12 @@
</span><span class="cx"> return button.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlSeekBackButtonElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-seek-back-button", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlRewindButtonElement::MediaControlRewindButtonElement(Document& document)
</span><span class="cx"> : MediaControlInputElement(document, MediaRewindButton)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-rewind-button", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlRewindButtonElement> MediaControlRewindButtonElement::create(Document& document)
</span><span class="lines">@@ -645,18 +572,12 @@
</span><span class="cx"> HTMLInputElement::defaultEventHandler(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlRewindButtonElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-rewind-button", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlReturnToRealtimeButtonElement::MediaControlReturnToRealtimeButtonElement(Document& document)
</span><span class="cx"> : MediaControlInputElement(document, MediaReturnToRealtimeButton)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-return-to-realtime-button", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlReturnToRealtimeButtonElement> MediaControlReturnToRealtimeButtonElement::create(Document& document)
</span><span class="lines">@@ -677,12 +598,6 @@
</span><span class="cx"> HTMLInputElement::defaultEventHandler(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlReturnToRealtimeButtonElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-return-to-realtime-button", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement(Document& document, MediaControls* controls)
</span><span class="lines">@@ -694,7 +609,7 @@
</span><span class="cx"> #if !PLATFORM(COCOA) && !PLATFORM(WIN) || !PLATFORM(GTK)
</span><span class="cx"> UNUSED_PARAM(controls);
</span><span class="cx"> #endif
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-toggle-closed-captions-button", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlToggleClosedCaptionsButtonElement> MediaControlToggleClosedCaptionsButtonElement::create(Document& document, MediaControls* controls)
</span><span class="lines">@@ -735,18 +650,12 @@
</span><span class="cx"> HTMLInputElement::defaultEventHandler(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlToggleClosedCaptionsButtonElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-toggle-closed-captions-button", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlClosedCaptionsContainerElement::MediaControlClosedCaptionsContainerElement(Document& document)
</span><span class="cx"> : MediaControlDivElement(document, MediaClosedCaptionsContainer)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-closed-captions-container", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlClosedCaptionsContainerElement> MediaControlClosedCaptionsContainerElement::create(Document& document)
</span><span class="lines">@@ -757,12 +666,6 @@
</span><span class="cx"> return element.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlClosedCaptionsContainerElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-closed-captions-container", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlClosedCaptionsTrackListElement::MediaControlClosedCaptionsTrackListElement(Document& document, MediaControls* controls)
</span><span class="lines">@@ -774,7 +677,7 @@
</span><span class="cx"> #if !ENABLE(VIDEO_TRACK)
</span><span class="cx"> UNUSED_PARAM(controls);
</span><span class="cx"> #endif
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-closed-captions-track-list", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlClosedCaptionsTrackListElement> MediaControlClosedCaptionsTrackListElement::create(Document& document, MediaControls* controls)
</span><span class="lines">@@ -821,12 +724,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlClosedCaptionsTrackListElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-closed-captions-track-list", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> void MediaControlClosedCaptionsTrackListElement::updateDisplay()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="lines">@@ -940,7 +837,7 @@
</span><span class="cx"> : MediaControlInputElement(document, MediaSlider)
</span><span class="cx"> , m_controls(controls)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-timeline", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlTimelineElement> MediaControlTimelineElement::create(Document& document, MediaControls* controls)
</span><span class="lines">@@ -1003,19 +900,12 @@
</span><span class="cx"> setAttribute(maxAttr, AtomicString::number(std::isfinite(duration) ? duration : 0));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-const AtomicString& MediaControlTimelineElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-timeline", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlPanelVolumeSliderElement::MediaControlPanelVolumeSliderElement(Document& document)
</span><span class="cx"> : MediaControlVolumeSliderElement(document)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-volume-slider", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlPanelVolumeSliderElement> MediaControlPanelVolumeSliderElement::create(Document& document)
</span><span class="lines">@@ -1028,18 +918,12 @@
</span><span class="cx"> return slider.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlPanelVolumeSliderElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-volume-slider", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlFullscreenVolumeSliderElement::MediaControlFullscreenVolumeSliderElement(Document& document)
</span><span class="cx"> : MediaControlVolumeSliderElement(document)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-fullscreen-volume-slider", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlFullscreenVolumeSliderElement> MediaControlFullscreenVolumeSliderElement::create(Document& document)
</span><span class="lines">@@ -1052,18 +936,12 @@
</span><span class="cx"> return slider.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlFullscreenVolumeSliderElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-volume-slider", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlFullscreenButtonElement::MediaControlFullscreenButtonElement(Document& document)
</span><span class="cx"> : MediaControlInputElement(document, MediaEnterFullscreenButton)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-fullscreen-button", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlFullscreenButtonElement> MediaControlFullscreenButtonElement::create(Document& document)
</span><span class="lines">@@ -1097,12 +975,6 @@
</span><span class="cx"> HTMLInputElement::defaultEventHandler(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlFullscreenButtonElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-button", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> void MediaControlFullscreenButtonElement::setIsFullscreen(bool isFullscreen)
</span><span class="cx"> {
</span><span class="cx"> setDisplayType(isFullscreen ? MediaExitFullscreenButton : MediaEnterFullscreenButton);
</span><span class="lines">@@ -1113,7 +985,7 @@
</span><span class="cx"> MediaControlFullscreenVolumeMinButtonElement::MediaControlFullscreenVolumeMinButtonElement(Document& document)
</span><span class="cx"> : MediaControlInputElement(document, MediaUnMuteButton)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-fullscreen-volume-min-button", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlFullscreenVolumeMinButtonElement> MediaControlFullscreenVolumeMinButtonElement::create(Document& document)
</span><span class="lines">@@ -1134,18 +1006,12 @@
</span><span class="cx"> HTMLInputElement::defaultEventHandler(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlFullscreenVolumeMinButtonElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-volume-min-button", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlFullscreenVolumeMaxButtonElement::MediaControlFullscreenVolumeMaxButtonElement(Document& document)
</span><span class="cx"> : MediaControlInputElement(document, MediaMuteButton)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-controls-fullscreen-volume-max-button", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlFullscreenVolumeMaxButtonElement> MediaControlFullscreenVolumeMaxButtonElement::create(Document& document)
</span><span class="lines">@@ -1166,18 +1032,12 @@
</span><span class="cx"> HTMLInputElement::defaultEventHandler(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlFullscreenVolumeMaxButtonElement::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-fullscreen-volume-max-button", AtomicString::ConstructFromLiteral));
- return id;
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlTimeRemainingDisplayElement::MediaControlTimeRemainingDisplayElement(Document& document)
</span><span class="cx"> : MediaControlTimeDisplayElement(document, MediaTimeRemainingDisplay)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(getMediaControlTimeRemainingDisplayElementShadowPseudoId());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlTimeRemainingDisplayElement> MediaControlTimeRemainingDisplayElement::create(Document& document)
</span><span class="lines">@@ -1191,17 +1051,12 @@
</span><span class="cx"> return id;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlTimeRemainingDisplayElement::shadowPseudoId() const
-{
- return getMediaControlTimeRemainingDisplayElementShadowPseudoId();
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> MediaControlCurrentTimeDisplayElement::MediaControlCurrentTimeDisplayElement(Document& document)
</span><span class="cx"> : MediaControlTimeDisplayElement(document, MediaCurrentTimeDisplay)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(getMediaControlCurrentTimeDisplayElementShadowPseudoId());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlCurrentTimeDisplayElement> MediaControlCurrentTimeDisplayElement::create(Document& document)
</span><span class="lines">@@ -1215,11 +1070,6 @@
</span><span class="cx"> return id;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlCurrentTimeDisplayElement::shadowPseudoId() const
-{
- return getMediaControlCurrentTimeDisplayElementShadowPseudoId();
-}
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="lines">@@ -1231,7 +1081,7 @@
</span><span class="cx"> , m_fontSizeIsImportant(false)
</span><span class="cx"> , m_updateTextTrackRepresentationStyle(false)
</span><span class="cx"> {
</span><del>- setPseudo(shadowPseudoId());
</del><ins>+ setPseudo(AtomicString("-webkit-media-text-track-container", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<MediaControlTextTrackContainerElement> MediaControlTextTrackContainerElement::create(Document& document)
</span><span class="lines">@@ -1246,17 +1096,6 @@
</span><span class="cx"> return createRenderer<RenderTextTrackContainerElement>(*this, WTF::move(style));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControlTextTrackContainerElement::textTrackContainerElementShadowPseudoId()
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-text-track-container", AtomicString::ConstructFromLiteral));
- return id;
-}
-
-const AtomicString& MediaControlTextTrackContainerElement::shadowPseudoId() const
-{
- return textTrackContainerElementShadowPseudoId();
-}
-
</del><span class="cx"> void MediaControlTextTrackContainerElement::updateDisplay()
</span><span class="cx"> {
</span><span class="cx"> if (!mediaController()->closedCaptionsVisible())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.h (171906 => 171907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.h 2014-08-01 02:20:48 UTC (rev 171906)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.h 2014-08-01 03:42:47 UTC (rev 171907)
</span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlPanelElement(Document&);
</span><span class="cx">
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><span class="cx">
</span><span class="cx"> void startDrag(const LayoutPoint& eventLocation);
</span><span class="lines">@@ -88,7 +87,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlPanelEnclosureElement(Document&);
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // ----------------------------
</span><span class="lines">@@ -99,7 +97,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlOverlayEnclosureElement(Document&);
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // ----------------------------
</span><span class="lines">@@ -112,7 +109,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlTimelineContainerElement(Document&);
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx">
</span><span class="cx"> virtual RenderPtr<RenderElement> createElementRenderer(PassRef<RenderStyle>) override;
</span><span class="cx"> };
</span><span class="lines">@@ -130,7 +126,6 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlVolumeSliderContainerElement(Document&);
</span><span class="cx">
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><span class="cx">
</span><span class="cx"> virtual RenderPtr<RenderElement> createElementRenderer(PassRef<RenderStyle>) override;
</span><span class="lines">@@ -146,7 +141,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlStatusDisplayElement(Document&);
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx">
</span><span class="cx"> enum StateBeingDisplayed { Nothing, Loading, LiveBroadcast };
</span><span class="cx"> StateBeingDisplayed m_stateBeingDisplayed;
</span><span class="lines">@@ -165,7 +159,6 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlPanelMuteButtonElement(Document&, MediaControls*);
</span><span class="cx">
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><span class="cx">
</span><span class="cx"> MediaControls* m_controls;
</span><span class="lines">@@ -179,7 +172,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlVolumeSliderMuteButtonElement(Document&);
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -198,7 +190,6 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlPlayButtonElement(Document&);
</span><span class="cx">
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -213,7 +204,6 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlOverlayPlayButtonElement(Document&);
</span><span class="cx">
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -225,7 +215,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlSeekForwardButtonElement(Document&);
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx">
</span><span class="cx"> virtual bool isForwardButton() const override { return true; }
</span><span class="cx"> };
</span><span class="lines">@@ -238,7 +227,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlSeekBackButtonElement(Document&);
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx">
</span><span class="cx"> virtual bool isForwardButton() const override { return false; }
</span><span class="cx"> };
</span><span class="lines">@@ -256,7 +244,6 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlRewindButtonElement(Document&);
</span><span class="cx">
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -273,7 +260,6 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlReturnToRealtimeButtonElement(Document&);
</span><span class="cx">
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -292,7 +278,6 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlToggleClosedCaptionsButtonElement(Document&, MediaControls*);
</span><span class="cx">
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) || PLATFORM(WIN) || PLATFORM(GTK)
</span><span class="lines">@@ -312,7 +297,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MediaControlClosedCaptionsContainerElement(Document&);
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // ----------------------------
</span><span class="lines">@@ -332,7 +316,6 @@
</span><span class="cx">
</span><span class="cx"> void rebuildTrackListMenu();
</span><span class="cx">
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><span class="cx">
</span><span class="cx"> typedef Vector<RefPtr<Element>> TrackMenuItems;
</span><span class="lines">@@ -360,7 +343,6 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlTimelineElement(Document&, MediaControls*);
</span><span class="cx">
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><span class="cx">
</span><span class="cx"> MediaControls* m_controls;
</span><span class="lines">@@ -381,7 +363,6 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlFullscreenButtonElement(Document&);
</span><span class="cx">
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -393,7 +374,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlPanelVolumeSliderElement(Document&);
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> };
</span><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="lines">@@ -403,7 +383,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlFullscreenVolumeSliderElement(Document&);
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // ----------------------------
</span><span class="lines">@@ -418,7 +397,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlFullscreenVolumeMinButtonElement(Document&);
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -435,7 +413,6 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlFullscreenVolumeMaxButtonElement(Document&);
</span><span class="cx">
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -448,7 +425,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlTimeRemainingDisplayElement(Document&);
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // ----------------------------
</span><span class="lines">@@ -459,7 +435,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit MediaControlCurrentTimeDisplayElement(Document&);
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // ----------------------------
</span><span class="lines">@@ -474,14 +449,12 @@
</span><span class="cx"> void updateSizes(bool forceUpdate = false);
</span><span class="cx"> void enteredFullscreen();
</span><span class="cx"> void exitedFullscreen();
</span><del>- static const AtomicString& textTrackContainerElementShadowPseudoId();
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void updateTimerFired(Timer<MediaControlTextTrackContainerElement>&);
</span><span class="cx"> void updateActiveCuesFontSize();
</span><span class="cx">
</span><span class="cx"> explicit MediaControlTextTrackContainerElement(Document&);
</span><del>- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx">
</span><span class="cx"> virtual RenderPtr<RenderElement> createElementRenderer(PassRef<RenderStyle>) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControls.cpp (171906 => 171907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControls.cpp 2014-08-01 02:20:48 UTC (rev 171906)
+++ trunk/Source/WebCore/html/shadow/MediaControls.cpp 2014-08-01 03:42:47 UTC (rev 171907)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> , m_isFullscreen(false)
</span><span class="cx"> , m_isMouseOverControls(false)
</span><span class="cx"> {
</span><ins>+ setPseudo(AtomicString("-webkit-media-controls", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaControls::setMediaController(MediaControllerInterface* controller)
</span><span class="lines">@@ -363,12 +364,6 @@
</span><span class="cx"> m_hideFullscreenControlsTimer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AtomicString& MediaControls::shadowPseudoId() const
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls"));
- return id;
-}
-
</del><span class="cx"> bool MediaControls::containsRelatedTarget(Event* event)
</span><span class="cx"> {
</span><span class="cx"> if (!event->isMouseEvent())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControls.h (171906 => 171907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControls.h 2014-08-01 02:20:48 UTC (rev 171906)
+++ trunk/Source/WebCore/html/shadow/MediaControls.h 2014-08-01 03:42:47 UTC (rev 171907)
</span><span class="lines">@@ -143,8 +143,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual bool isMediaControls() const override { return true; }
</span><del>-
- virtual const AtomicString& shadowPseudoId() const override;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline MediaControls* toMediaControls(Node* node)
</span></span></pre>
</div>
</div>
</body>
</html>