[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

dglazkov at chromium.org dglazkov at chromium.org
Sun Feb 20 23:55:43 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 1d30284c8f6e21f91f8a1f3b62b6109adaba7b00
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 26 22:19:57 2011 +0000

    2011-01-25  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Reviewed by Kent Tamura.
    
            Change HTMLInputElement-derived parts of media element shadow DOM to use shadowPseudoId.
            https://bugs.webkit.org/show_bug.cgi?id=53122
    
            This is the first step in converting HTMLMediaElement to the new shadow DOM.
    
            Should not regress any existing tests. No observable change in behavior.
    
            * css/CSSSelector.cpp:
            (WebCore::CSSSelector::pseudoId): Removed now-unnecessary hard-coded pseudo-element selectors.
            (WebCore::nameToPseudoTypeMap): Ditto.
            (WebCore::CSSSelector::extractPseudoType): Ditto.
            * css/CSSSelector.h: Ditto.
            * css/mediaControls.css: Added proper initial values, now that elements use the proper selector pipeline.
            * rendering/MediaControlElements.cpp:
            (WebCore::MediaControlInputElement::MediaControlInputElement): Removed the switch statement,
                which is now replaced with virtual shadowPseudoId on each corresponding class.
            (WebCore::MediaControlInputElement::styleForElement): Changed to use element pipeline.
            (WebCore::MediaControlMuteButtonElement::MediaControlMuteButtonElement): Changed to set
                display type in constructor.
            (WebCore::MediaControlMuteButtonElement::create): Changed to not take PseudoId as
                constructor argument.
            (WebCore::MediaControlMuteButtonElement::shadowPseudoId): Added.
            (WebCore::MediaControlVolumeSliderMuteButtonElement::MediaControlVolumeSliderMuteButtonElement): Added
                to disambiguate from the MediaControlMuteButtonElement.
            (WebCore::MediaControlVolumeSliderMuteButtonElement::create): Added.
            (WebCore::MediaControlVolumeSliderMuteButtonElement::shadowPseudoId): Added.
            (WebCore::MediaControlPlayButtonElement::MediaControlPlayButtonElement): Changed to not take PseudoId as
                constructor argument.
            (WebCore::MediaControlPlayButtonElement::shadowPseudoId): Added.
            (WebCore::MediaControlSeekButtonElement::MediaControlSeekButtonElement): Changed to not take PseudoId as
                constructor argument.
            (WebCore::MediaControlSeekForwardButtonElement::MediaControlSeekForwardButtonElement): Added.
            (WebCore::MediaControlSeekForwardButtonElement::create): Added.
            (WebCore::MediaControlSeekForwardButtonElement::shadowPseudoId): Added.
            (WebCore::MediaControlSeekBackButtonElement::MediaControlSeekBackButtonElement): Added.
            (WebCore::MediaControlSeekBackButtonElement::create): Added.
            (WebCore::MediaControlSeekBackButtonElement::shadowPseudoId): Added.
            (WebCore::MediaControlRewindButtonElement::MediaControlRewindButtonElement): Added.
            (WebCore::MediaControlRewindButtonElement::shadowPseudoId): Added.
            (WebCore::MediaControlReturnToRealtimeButtonElement::MediaControlReturnToRealtimeButtonElement): Changed to not take PseudoId as
                constructor argument.
            (WebCore::MediaControlReturnToRealtimeButtonElement::shadowPseudoId): Added.
            (WebCore::MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement): Changed to not take PseudoId as
                constructor argument.
            (WebCore::MediaControlToggleClosedCaptionsButtonElement::shadowPseudoId): Added.
            (WebCore::MediaControlTimelineElement::MediaControlTimelineElement): Changed to not take PseudoId as
                constructor argument.
            (WebCore::MediaControlTimelineElement::shadowPseudoId): Added.
            (WebCore::MediaControlVolumeSliderElement::MediaControlVolumeSliderElement): Changed to not take PseudoId as
                constructor argument.
            (WebCore::MediaControlVolumeSliderElement::shadowPseudoId): Added.
            (WebCore::MediaControlFullscreenButtonElement::MediaControlFullscreenButtonElement): Changed to not take PseudoId as
                constructor argument.
            (WebCore::MediaControlFullscreenButtonElement::shadowPseudoId): Added.
            * rendering/MediaControlElements.h:
            (WebCore::MediaControlSeekForwardButtonElement::isForwardButton): Added.
            (WebCore::MediaControlSeekBackButtonElement::isForwardButton): Added.
            * rendering/RenderMedia.cpp:
            (WebCore::RenderMedia::createMuteButton): Changed to use new constructor.
            (WebCore::RenderMedia::createSeekBackButton): Ditto.
            (WebCore::RenderMedia::createSeekForwardButton): Ditto.
            (WebCore::RenderMedia::createVolumeSliderMuteButton): Ditto.
            * rendering/style/RenderStyleConstants.h: Removed constants that are no longer used.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76719 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c120bd6..7f57c49 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,71 @@
+2011-01-25  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        Change HTMLInputElement-derived parts of media element shadow DOM to use shadowPseudoId.
+        https://bugs.webkit.org/show_bug.cgi?id=53122
+
+        This is the first step in converting HTMLMediaElement to the new shadow DOM.
+
+        Should not regress any existing tests. No observable change in behavior.
+
+        * css/CSSSelector.cpp:
+        (WebCore::CSSSelector::pseudoId): Removed now-unnecessary hard-coded pseudo-element selectors.
+        (WebCore::nameToPseudoTypeMap): Ditto.
+        (WebCore::CSSSelector::extractPseudoType): Ditto.
+        * css/CSSSelector.h: Ditto.
+        * css/mediaControls.css: Added proper initial values, now that elements use the proper selector pipeline.
+        * rendering/MediaControlElements.cpp:
+        (WebCore::MediaControlInputElement::MediaControlInputElement): Removed the switch statement,
+            which is now replaced with virtual shadowPseudoId on each corresponding class.
+        (WebCore::MediaControlInputElement::styleForElement): Changed to use element pipeline.
+        (WebCore::MediaControlMuteButtonElement::MediaControlMuteButtonElement): Changed to set
+            display type in constructor.
+        (WebCore::MediaControlMuteButtonElement::create): Changed to not take PseudoId as
+            constructor argument.
+        (WebCore::MediaControlMuteButtonElement::shadowPseudoId): Added.
+        (WebCore::MediaControlVolumeSliderMuteButtonElement::MediaControlVolumeSliderMuteButtonElement): Added
+            to disambiguate from the MediaControlMuteButtonElement.
+        (WebCore::MediaControlVolumeSliderMuteButtonElement::create): Added.
+        (WebCore::MediaControlVolumeSliderMuteButtonElement::shadowPseudoId): Added.
+        (WebCore::MediaControlPlayButtonElement::MediaControlPlayButtonElement): Changed to not take PseudoId as
+            constructor argument.
+        (WebCore::MediaControlPlayButtonElement::shadowPseudoId): Added.
+        (WebCore::MediaControlSeekButtonElement::MediaControlSeekButtonElement): Changed to not take PseudoId as
+            constructor argument.
+        (WebCore::MediaControlSeekForwardButtonElement::MediaControlSeekForwardButtonElement): Added.
+        (WebCore::MediaControlSeekForwardButtonElement::create): Added.
+        (WebCore::MediaControlSeekForwardButtonElement::shadowPseudoId): Added.
+        (WebCore::MediaControlSeekBackButtonElement::MediaControlSeekBackButtonElement): Added.
+        (WebCore::MediaControlSeekBackButtonElement::create): Added.
+        (WebCore::MediaControlSeekBackButtonElement::shadowPseudoId): Added.
+        (WebCore::MediaControlRewindButtonElement::MediaControlRewindButtonElement): Added.
+        (WebCore::MediaControlRewindButtonElement::shadowPseudoId): Added.
+        (WebCore::MediaControlReturnToRealtimeButtonElement::MediaControlReturnToRealtimeButtonElement): Changed to not take PseudoId as
+            constructor argument.
+        (WebCore::MediaControlReturnToRealtimeButtonElement::shadowPseudoId): Added.
+        (WebCore::MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement): Changed to not take PseudoId as
+            constructor argument.
+        (WebCore::MediaControlToggleClosedCaptionsButtonElement::shadowPseudoId): Added.
+        (WebCore::MediaControlTimelineElement::MediaControlTimelineElement): Changed to not take PseudoId as
+            constructor argument.
+        (WebCore::MediaControlTimelineElement::shadowPseudoId): Added.
+        (WebCore::MediaControlVolumeSliderElement::MediaControlVolumeSliderElement): Changed to not take PseudoId as
+            constructor argument.
+        (WebCore::MediaControlVolumeSliderElement::shadowPseudoId): Added.
+        (WebCore::MediaControlFullscreenButtonElement::MediaControlFullscreenButtonElement): Changed to not take PseudoId as
+            constructor argument.
+        (WebCore::MediaControlFullscreenButtonElement::shadowPseudoId): Added.
+        * rendering/MediaControlElements.h:
+        (WebCore::MediaControlSeekForwardButtonElement::isForwardButton): Added.
+        (WebCore::MediaControlSeekBackButtonElement::isForwardButton): Added.
+        * rendering/RenderMedia.cpp:
+        (WebCore::RenderMedia::createMuteButton): Changed to use new constructor.
+        (WebCore::RenderMedia::createSeekBackButton): Ditto.
+        (WebCore::RenderMedia::createSeekForwardButton): Ditto.
+        (WebCore::RenderMedia::createVolumeSliderMuteButton): Ditto.
+        * rendering/style/RenderStyleConstants.h: Removed constants that are no longer used.
+
 2011-01-26  Kenneth Russell  <kbr at google.com>
 
         Reviewed by James Robinson.
diff --git a/Source/WebCore/css/CSSSelector.cpp b/Source/WebCore/css/CSSSelector.cpp
index 8ff3859..1be7f36 100644
--- a/Source/WebCore/css/CSSSelector.cpp
+++ b/Source/WebCore/css/CSSSelector.cpp
@@ -140,10 +140,6 @@ PseudoId CSSSelector::pseudoId(PseudoType type)
         return SEARCH_RESULTS_BUTTON;
     case PseudoMediaControlsPanel:
         return MEDIA_CONTROLS_PANEL;
-    case PseudoMediaControlsMuteButton:
-        return MEDIA_CONTROLS_MUTE_BUTTON;
-    case PseudoMediaControlsPlayButton:
-        return MEDIA_CONTROLS_PLAY_BUTTON;
     case PseudoMediaControlsTimelineContainer:
         return MEDIA_CONTROLS_TIMELINE_CONTAINER;
     case PseudoMediaControlsVolumeSliderContainer:
@@ -152,26 +148,8 @@ PseudoId CSSSelector::pseudoId(PseudoType type)
         return MEDIA_CONTROLS_CURRENT_TIME_DISPLAY;
     case PseudoMediaControlsTimeRemainingDisplay:
         return MEDIA_CONTROLS_TIME_REMAINING_DISPLAY;
-    case PseudoMediaControlsTimeline:
-        return MEDIA_CONTROLS_TIMELINE;
-    case PseudoMediaControlsVolumeSlider:
-        return MEDIA_CONTROLS_VOLUME_SLIDER;
-    case PseudoMediaControlsVolumeSliderMuteButton:
-        return MEDIA_CONTROLS_VOLUME_SLIDER_MUTE_BUTTON;
-    case PseudoMediaControlsSeekBackButton:
-        return MEDIA_CONTROLS_SEEK_BACK_BUTTON;
-    case PseudoMediaControlsSeekForwardButton:
-        return MEDIA_CONTROLS_SEEK_FORWARD_BUTTON;
-    case PseudoMediaControlsRewindButton:
-        return MEDIA_CONTROLS_REWIND_BUTTON;
-    case PseudoMediaControlsReturnToRealtimeButton:
-        return MEDIA_CONTROLS_RETURN_TO_REALTIME_BUTTON;
-    case PseudoMediaControlsToggleClosedCaptions:
-        return MEDIA_CONTROLS_TOGGLE_CLOSED_CAPTIONS_BUTTON;
     case PseudoMediaControlsStatusDisplay:
         return MEDIA_CONTROLS_STATUS_DISPLAY;
-    case PseudoMediaControlsFullscreenButton:
-        return MEDIA_CONTROLS_FULLSCREEN_BUTTON;
     case PseudoScrollbar:
         return SCROLLBAR;
     case PseudoScrollbarButton:
@@ -347,18 +325,7 @@ static HashMap<AtomicStringImpl*, CSSSelector::PseudoType>* nameToPseudoTypeMap(
     DEFINE_STATIC_LOCAL(AtomicString, link, ("link"));
     DEFINE_STATIC_LOCAL(AtomicString, lang, ("lang("));
     DEFINE_STATIC_LOCAL(AtomicString, mediaControlsPanel, ("-webkit-media-controls-panel"));
-    DEFINE_STATIC_LOCAL(AtomicString, mediaControlsMuteButton, ("-webkit-media-controls-mute-button"));
-    DEFINE_STATIC_LOCAL(AtomicString, mediaControlsPlayButton, ("-webkit-media-controls-play-button"));
-    DEFINE_STATIC_LOCAL(AtomicString, mediaControlsTimeline, ("-webkit-media-controls-timeline"));
-    DEFINE_STATIC_LOCAL(AtomicString, mediaControlsVolumeSlider, ("-webkit-media-controls-volume-slider"));
-    DEFINE_STATIC_LOCAL(AtomicString, mediaControlsVolumeSliderMuteButton, ("-webkit-media-controls-volume-slider-mute-button"));
-    DEFINE_STATIC_LOCAL(AtomicString, mediaControlsSeekBackButton, ("-webkit-media-controls-seek-back-button"));
-    DEFINE_STATIC_LOCAL(AtomicString, mediaControlsSeekForwardButton, ("-webkit-media-controls-seek-forward-button"));
-    DEFINE_STATIC_LOCAL(AtomicString, mediaControlsRewindButton, ("-webkit-media-controls-rewind-button"));
-    DEFINE_STATIC_LOCAL(AtomicString, mediaControlsReturnToRealtimeButton, ("-webkit-media-controls-return-to-realtime-button"));
-    DEFINE_STATIC_LOCAL(AtomicString, mediaControlsToggleClosedCaptionsButton, ("-webkit-media-controls-toggle-closed-captions-button"));
     DEFINE_STATIC_LOCAL(AtomicString, mediaControlsStatusDisplay, ("-webkit-media-controls-status-display"));
-    DEFINE_STATIC_LOCAL(AtomicString, mediaControlsFullscreenButton, ("-webkit-media-controls-fullscreen-button"));
     DEFINE_STATIC_LOCAL(AtomicString, mediaControlsTimelineContainer, ("-webkit-media-controls-timeline-container"));
     DEFINE_STATIC_LOCAL(AtomicString, mediaControlsVolumeSliderContainer, ("-webkit-media-controls-volume-slider-container"));
     DEFINE_STATIC_LOCAL(AtomicString, mediaControlsCurrentTimeDisplay, ("-webkit-media-controls-current-time-display"));
@@ -464,20 +431,9 @@ static HashMap<AtomicStringImpl*, CSSSelector::PseudoType>* nameToPseudoTypeMap(
         nameToPseudoType->set(link.impl(), CSSSelector::PseudoLink);
         nameToPseudoType->set(lang.impl(), CSSSelector::PseudoLang);
         nameToPseudoType->set(mediaControlsPanel.impl(), CSSSelector::PseudoMediaControlsPanel);
-        nameToPseudoType->set(mediaControlsMuteButton.impl(), CSSSelector::PseudoMediaControlsMuteButton);
-        nameToPseudoType->set(mediaControlsPlayButton.impl(), CSSSelector::PseudoMediaControlsPlayButton);
         nameToPseudoType->set(mediaControlsCurrentTimeDisplay.impl(), CSSSelector::PseudoMediaControlsCurrentTimeDisplay);
         nameToPseudoType->set(mediaControlsTimeRemainingDisplay.impl(), CSSSelector::PseudoMediaControlsTimeRemainingDisplay);
-        nameToPseudoType->set(mediaControlsTimeline.impl(), CSSSelector::PseudoMediaControlsTimeline);
-        nameToPseudoType->set(mediaControlsVolumeSlider.impl(), CSSSelector::PseudoMediaControlsVolumeSlider);
-        nameToPseudoType->set(mediaControlsVolumeSliderMuteButton.impl(), CSSSelector::PseudoMediaControlsVolumeSliderMuteButton);
-        nameToPseudoType->set(mediaControlsSeekBackButton.impl(), CSSSelector::PseudoMediaControlsSeekBackButton);
-        nameToPseudoType->set(mediaControlsSeekForwardButton.impl(), CSSSelector::PseudoMediaControlsSeekForwardButton);
-        nameToPseudoType->set(mediaControlsRewindButton.impl(), CSSSelector::PseudoMediaControlsRewindButton);
-        nameToPseudoType->set(mediaControlsReturnToRealtimeButton.impl(), CSSSelector::PseudoMediaControlsReturnToRealtimeButton);
-        nameToPseudoType->set(mediaControlsToggleClosedCaptionsButton.impl(), CSSSelector::PseudoMediaControlsToggleClosedCaptions);
         nameToPseudoType->set(mediaControlsStatusDisplay.impl(), CSSSelector::PseudoMediaControlsStatusDisplay);
-        nameToPseudoType->set(mediaControlsFullscreenButton.impl(), CSSSelector::PseudoMediaControlsFullscreenButton);
         nameToPseudoType->set(mediaControlsTimelineContainer.impl(), CSSSelector::PseudoMediaControlsTimelineContainer);
         nameToPseudoType->set(mediaControlsVolumeSliderContainer.impl(), CSSSelector::PseudoMediaControlsVolumeSliderContainer);
         nameToPseudoType->set(notStr.impl(), CSSSelector::PseudoNot);
@@ -574,20 +530,9 @@ void CSSSelector::extractPseudoType() const
 #endif
     case PseudoInnerSpinButton:
     case PseudoMediaControlsPanel:
-    case PseudoMediaControlsMuteButton:
-    case PseudoMediaControlsPlayButton:
     case PseudoMediaControlsCurrentTimeDisplay:
     case PseudoMediaControlsTimeRemainingDisplay:
-    case PseudoMediaControlsTimeline:
-    case PseudoMediaControlsVolumeSlider:
-    case PseudoMediaControlsVolumeSliderMuteButton:
-    case PseudoMediaControlsSeekBackButton:
-    case PseudoMediaControlsSeekForwardButton:
-    case PseudoMediaControlsRewindButton:
-    case PseudoMediaControlsReturnToRealtimeButton:
-    case PseudoMediaControlsToggleClosedCaptions:
     case PseudoMediaControlsStatusDisplay:
-    case PseudoMediaControlsFullscreenButton:
     case PseudoMediaControlsTimelineContainer:
     case PseudoMediaControlsVolumeSliderContainer:
     case PseudoMeterHorizontalBar:
diff --git a/Source/WebCore/css/CSSSelector.h b/Source/WebCore/css/CSSSelector.h
index 66c94f3..cbe3e9b 100644
--- a/Source/WebCore/css/CSSSelector.h
+++ b/Source/WebCore/css/CSSSelector.h
@@ -176,22 +176,11 @@ namespace WebCore {
             PseudoSearchResultsDecoration,
             PseudoSearchResultsButton,
             PseudoMediaControlsPanel,
-            PseudoMediaControlsMuteButton,
-            PseudoMediaControlsPlayButton,
             PseudoMediaControlsTimelineContainer,
             PseudoMediaControlsVolumeSliderContainer,
-            PseudoMediaControlsVolumeSliderMuteButton,
             PseudoMediaControlsCurrentTimeDisplay,
             PseudoMediaControlsTimeRemainingDisplay,
-            PseudoMediaControlsToggleClosedCaptions,
-            PseudoMediaControlsTimeline,
-            PseudoMediaControlsVolumeSlider,
-            PseudoMediaControlsSeekBackButton,
-            PseudoMediaControlsSeekForwardButton,
-            PseudoMediaControlsRewindButton,
-            PseudoMediaControlsReturnToRealtimeButton,
             PseudoMediaControlsStatusDisplay,
-            PseudoMediaControlsFullscreenButton,
             PseudoMeterHorizontalBar,
             PseudoMeterVerticalBar,
             PseudoMeterHorizontalOptimum,
diff --git a/Source/WebCore/css/mediaControls.css b/Source/WebCore/css/mediaControls.css
index 6a0f14b..88144b4 100644
--- a/Source/WebCore/css/mediaControls.css
+++ b/Source/WebCore/css/mediaControls.css
@@ -52,6 +52,9 @@ audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-bu
     display: -webkit-box;
     width: 16px;
     height: 16px;
+    background-color: initial;
+    border: initial;
+    color: inherit;
 }
 
 audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
@@ -59,6 +62,9 @@ audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-bu
     display: -webkit-box;
     width: 16px;
     height: 16px;
+    background-color: initial;
+    border: initial;
+    color: inherit;
 }
 
 audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container {
@@ -86,6 +92,10 @@ audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
     -webkit-box-flex: 1;
     height: 16px;
     padding: 0px 2px;
+    background-color: initial;
+    border: initial;
+    color: inherit;
+    margin: initial;
 }
 
 audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container {
@@ -94,6 +104,10 @@ audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-cont
 
 audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider {
     display: none;
+    background-color: initial;
+    border: initial;
+    color: inherit;
+    margin: initial;
 }
 
 audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button {
@@ -101,6 +115,9 @@ audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-se
     display: -webkit-box;
     width: 16px;
     height: 16px;
+    background-color: initial;
+    border: initial;
+    color: inherit;
 }
 
 audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button {
@@ -108,6 +125,9 @@ audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls
     display: -webkit-box;
     width: 16px;
     height: 16px;
+    background-color: initial;
+    border: initial;
+    color: inherit;
 }
 
 audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-fullscreen-button {
@@ -115,14 +135,23 @@ audio::-webkit-media-controls-fullscreen-button, video::-webkit-media-controls-f
     display: -webkit-box;
     width: 16px;
     height: 16px;
+    background-color: initial;
+    border: initial;
+    color: inherit;
 }
 
 audio::-webkit-media-controls-rewind-button, video::-webkit-media-controls-rewind-button {
     display: none;
+    background-color: initial;
+    border: initial;
+    color: inherit;
 }
 
 audio::-webkit-media-controls-return-to-realtime-button, video::-webkit-media-controls-return-to-realtime-button {
     display: none;
+    background-color: initial;
+    border: initial;
+    color: inherit;
 }
 
 audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-media-controls-toggle-closed-captions-button {
@@ -130,9 +159,15 @@ audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-medi
     display: -webkit-box;
     width: 16px;
     height: 16px;
+    background-color: initial;
+    border: initial;
+    color: inherit;
 }
 
 audio::-webkit-media-controls-volume-slider-mute-button, video::-webkit-media-controls-volume-slider-mute-button {
     -webkit-appearance: media-volume-slider-mute-button;
     display: none;
+    background-color: initial;
+    border: initial;
+    color: inherit;
 }
diff --git a/Source/WebCore/rendering/MediaControlElements.cpp b/Source/WebCore/rendering/MediaControlElements.cpp
index 113ca3b..f011842 100644
--- a/Source/WebCore/rendering/MediaControlElements.cpp
+++ b/Source/WebCore/rendering/MediaControlElements.cpp
@@ -32,6 +32,7 @@
 
 #include "MediaControlElements.h"
 
+#include "CSSStyleSelector.h"
 #include "EventNames.h"
 #include "FloatConversion.h"
 #include "Frame.h"
@@ -352,51 +353,11 @@ bool MediaControlStatusDisplayElement::rendererIsNeeded(RenderStyle* style)
 
 // ----------------------------
     
-MediaControlInputElement::MediaControlInputElement(HTMLMediaElement* mediaElement, PseudoId pseudo)
+MediaControlInputElement::MediaControlInputElement(HTMLMediaElement* mediaElement, MediaControlElementType displayType)
     : HTMLInputElement(inputTag, mediaElement->document(), 0, false)
     , m_mediaElement(mediaElement)
-    , m_pseudoStyleId(pseudo)
+    , m_displayType(displayType)
 {
-    setInDocument();
-
-    switch (pseudo) {
-    case MEDIA_CONTROLS_MUTE_BUTTON:
-        m_displayType = MediaMuteButton;
-        break;
-    case MEDIA_CONTROLS_PLAY_BUTTON:
-        m_displayType = MediaPlayButton;
-        break;
-    case MEDIA_CONTROLS_SEEK_FORWARD_BUTTON:
-        m_displayType = MediaSeekForwardButton;
-        break;
-    case MEDIA_CONTROLS_SEEK_BACK_BUTTON:
-        m_displayType = MediaSeekBackButton;
-        break;
-    case MEDIA_CONTROLS_FULLSCREEN_BUTTON:
-        m_displayType = MediaFullscreenButton;
-        break;
-    case MEDIA_CONTROLS_TIMELINE:
-        m_displayType = MediaSlider;
-        break;
-    case MEDIA_CONTROLS_RETURN_TO_REALTIME_BUTTON:
-        m_displayType = MediaReturnToRealtimeButton;
-        break;
-    case MEDIA_CONTROLS_REWIND_BUTTON:
-        m_displayType = MediaRewindButton;
-        break;
-    case MEDIA_CONTROLS_VOLUME_SLIDER:
-        m_displayType = MediaVolumeSlider;
-        break;
-    case MEDIA_CONTROLS_VOLUME_SLIDER_MUTE_BUTTON:
-        m_displayType = MediaVolumeSliderMuteButton;
-        break;
-    case MEDIA_CONTROLS_TOGGLE_CLOSED_CAPTIONS_BUTTON:
-        m_displayType = MediaShowClosedCaptionsButton;
-        break;
-    default:
-        ASSERT_NOT_REACHED();
-        break;
-    }
 }
 
 void MediaControlInputElement::attachToParent(Element* parent)
@@ -416,7 +377,7 @@ void MediaControlInputElement::update()
 
 PassRefPtr<RenderStyle> MediaControlInputElement::styleForElement()
 {
-    return mediaElement()->renderer()->getCachedPseudoStyle(m_pseudoStyleId);
+    return document()->styleSelector()->styleForElement(this, 0, true);
 }
 
 bool MediaControlInputElement::rendererIsNeeded(RenderStyle* style)
@@ -481,7 +442,7 @@ void MediaControlInputElement::updateStyle()
     if (Node* shadowNode = shadowRoot())
         shadowNode->recalcStyle(Node::Force);
 }
-    
+
 bool MediaControlInputElement::hitTest(const IntPoint& absPoint)
 {
     if (renderer() && renderer()->style()->hasAppearance())
@@ -502,14 +463,14 @@ void MediaControlInputElement::setDisplayType(MediaControlElementType displayTyp
 
 // ----------------------------
 
-inline MediaControlMuteButtonElement::MediaControlMuteButtonElement(HTMLMediaElement* mediaElement, ButtonLocation location)
-    : MediaControlInputElement(mediaElement, location == Controller ? MEDIA_CONTROLS_MUTE_BUTTON : MEDIA_CONTROLS_VOLUME_SLIDER_MUTE_BUTTON)
+inline MediaControlMuteButtonElement::MediaControlMuteButtonElement(HTMLMediaElement* mediaElement, MediaControlElementType displayType)
+    : MediaControlInputElement(mediaElement, displayType)
 {
 }
 
-PassRefPtr<MediaControlMuteButtonElement> MediaControlMuteButtonElement::create(HTMLMediaElement* mediaElement, ButtonLocation location)
+PassRefPtr<MediaControlMuteButtonElement> MediaControlMuteButtonElement::create(HTMLMediaElement* mediaElement)
 {
-    RefPtr<MediaControlMuteButtonElement> button = adoptRef(new MediaControlMuteButtonElement(mediaElement, location));
+    RefPtr<MediaControlMuteButtonElement> button = adoptRef(new MediaControlMuteButtonElement(mediaElement, MediaMuteButton));
     button->setType("button");
     return button.release();
 }
@@ -523,15 +484,39 @@ void MediaControlMuteButtonElement::defaultEventHandler(Event* event)
     HTMLInputElement::defaultEventHandler(event);
 }
 
+AtomicString MediaControlMuteButtonElement::shadowPseudoId() const
+{
+    DEFINE_STATIC_LOCAL(AtomicString, muteButton, ("-webkit-media-controls-mute-button"));
+    return muteButton;
+}
+
 void MediaControlMuteButtonElement::updateDisplayType()
 {
     setDisplayType(mediaElement()->muted() ? MediaUnMuteButton : MediaMuteButton);
 }
 
+inline MediaControlVolumeSliderMuteButtonElement::MediaControlVolumeSliderMuteButtonElement(HTMLMediaElement* mediaElement)
+    : MediaControlMuteButtonElement(mediaElement, MediaVolumeSliderMuteButton)
+{
+}
+
+PassRefPtr<MediaControlVolumeSliderMuteButtonElement> MediaControlVolumeSliderMuteButtonElement::create(HTMLMediaElement* mediaElement)
+{
+    RefPtr<MediaControlVolumeSliderMuteButtonElement> button = adoptRef(new MediaControlVolumeSliderMuteButtonElement(mediaElement));
+    button->setType("button");
+    return button.release();
+}
+
+AtomicString MediaControlVolumeSliderMuteButtonElement::shadowPseudoId() const
+{
+    DEFINE_STATIC_LOCAL(AtomicString, muteButton, ("-webkit-media-controls-volume-slider-mute-button"));
+    return muteButton;
+}
+
 // ----------------------------
 
 inline MediaControlPlayButtonElement::MediaControlPlayButtonElement(HTMLMediaElement* mediaElement)
-    : MediaControlInputElement(mediaElement, MEDIA_CONTROLS_PLAY_BUTTON)
+    : MediaControlInputElement(mediaElement, MediaPlayButton)
 {
 }
 
@@ -556,28 +541,22 @@ void MediaControlPlayButtonElement::updateDisplayType()
     setDisplayType(mediaElement()->canPlay() ? MediaPlayButton : MediaPauseButton);
 }
 
+AtomicString MediaControlPlayButtonElement::shadowPseudoId() const
+{
+    DEFINE_STATIC_LOCAL(AtomicString, playButton, ("-webkit-media-controls-play-button"));
+    return playButton;
+}
+
 // ----------------------------
 
-inline MediaControlSeekButtonElement::MediaControlSeekButtonElement(HTMLMediaElement* mediaElement, PseudoId pseudoId)
-    : MediaControlInputElement(mediaElement, pseudoId)
+inline MediaControlSeekButtonElement::MediaControlSeekButtonElement(HTMLMediaElement* mediaElement, MediaControlElementType displayType)
+    : MediaControlInputElement(mediaElement, displayType)
     , m_seeking(false)
     , m_capturing(false)
     , m_seekTimer(this, &MediaControlSeekButtonElement::seekTimerFired)
 {
 }
 
-PassRefPtr<MediaControlSeekButtonElement> MediaControlSeekButtonElement::create(HTMLMediaElement* mediaElement, PseudoId pseudoStyleId)
-{
-    RefPtr<MediaControlSeekButtonElement> button = adoptRef(new MediaControlSeekButtonElement(mediaElement, pseudoStyleId));
-    button->setType("button");
-    return button.release();
-}
-
-inline bool MediaControlSeekButtonElement::isForwardButton() const
-{
-    return pseudoStyleId() == MEDIA_CONTROLS_SEEK_FORWARD_BUTTON;
-}
-
 void MediaControlSeekButtonElement::defaultEventHandler(Event* event)
 {
     if (event->type() == eventNames().mousedownEvent) {
@@ -627,8 +606,48 @@ void MediaControlSeekButtonElement::detach()
 
 // ----------------------------
 
+inline MediaControlSeekForwardButtonElement::MediaControlSeekForwardButtonElement(HTMLMediaElement* mediaElement)
+    : MediaControlSeekButtonElement(mediaElement, MediaSeekForwardButton)
+{
+}
+
+PassRefPtr<MediaControlSeekForwardButtonElement> MediaControlSeekForwardButtonElement::create(HTMLMediaElement* mediaElement)
+{
+    RefPtr<MediaControlSeekForwardButtonElement> button = adoptRef(new MediaControlSeekForwardButtonElement(mediaElement));
+    button->setType("button");
+    return button.release();
+}
+
+AtomicString MediaControlSeekForwardButtonElement::shadowPseudoId() const
+{
+    DEFINE_STATIC_LOCAL(AtomicString, seekForwardButton, ("-webkit-media-controls-seek-forward-button"));
+    return seekForwardButton;
+}
+
+// ----------------------------
+
+inline MediaControlSeekBackButtonElement::MediaControlSeekBackButtonElement(HTMLMediaElement* mediaElement)
+    : MediaControlSeekButtonElement(mediaElement, MediaSeekBackButton)
+{
+}
+
+PassRefPtr<MediaControlSeekBackButtonElement> MediaControlSeekBackButtonElement::create(HTMLMediaElement* mediaElement)
+{
+    RefPtr<MediaControlSeekBackButtonElement> button = adoptRef(new MediaControlSeekBackButtonElement(mediaElement));
+    button->setType("button");
+    return button.release();
+}
+
+AtomicString MediaControlSeekBackButtonElement::shadowPseudoId() const
+{
+    DEFINE_STATIC_LOCAL(AtomicString, seekBackButton, ("-webkit-media-controls-seek-back-button"));
+    return seekBackButton;
+}
+
+// ----------------------------
+
 inline MediaControlRewindButtonElement::MediaControlRewindButtonElement(HTMLMediaElement* element)
-    : MediaControlInputElement(element, MEDIA_CONTROLS_REWIND_BUTTON)
+    : MediaControlInputElement(element, MediaRewindButton)
 {
 }
 
@@ -648,10 +667,16 @@ void MediaControlRewindButtonElement::defaultEventHandler(Event* event)
     HTMLInputElement::defaultEventHandler(event);
 }
 
+AtomicString MediaControlRewindButtonElement::shadowPseudoId() const
+{
+    DEFINE_STATIC_LOCAL(AtomicString, rewindButton, ("-webkit-media-controls-rewind-button"));
+    return rewindButton;
+}
+
 // ----------------------------
 
 inline MediaControlReturnToRealtimeButtonElement::MediaControlReturnToRealtimeButtonElement(HTMLMediaElement* mediaElement)
-    : MediaControlInputElement(mediaElement, MEDIA_CONTROLS_RETURN_TO_REALTIME_BUTTON)
+    : MediaControlInputElement(mediaElement, MediaReturnToRealtimeButton)
 {
 }
 
@@ -671,11 +696,16 @@ void MediaControlReturnToRealtimeButtonElement::defaultEventHandler(Event* event
     HTMLInputElement::defaultEventHandler(event);
 }
 
+AtomicString MediaControlReturnToRealtimeButtonElement::shadowPseudoId() const
+{
+    DEFINE_STATIC_LOCAL(AtomicString, returnToRealtimeButton, ("-webkit-media-controls-return-to-realtime-button"));
+    return returnToRealtimeButton;
+}
 
 // ----------------------------
 
 inline MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement(HTMLMediaElement* mediaElement)
-    : MediaControlInputElement(mediaElement, MEDIA_CONTROLS_TOGGLE_CLOSED_CAPTIONS_BUTTON)
+    : MediaControlInputElement(mediaElement, MediaShowClosedCaptionsButton)
 {
 }
 
@@ -701,10 +731,16 @@ void MediaControlToggleClosedCaptionsButtonElement::updateDisplayType()
     setDisplayType(mediaElement()->closedCaptionsVisible() ? MediaHideClosedCaptionsButton : MediaShowClosedCaptionsButton);
 }
 
+AtomicString MediaControlToggleClosedCaptionsButtonElement::shadowPseudoId() const
+{
+    DEFINE_STATIC_LOCAL(AtomicString, closedCaptionsButton, ("-webkit-media-controls-toggle-closed-captions-button"));
+    return closedCaptionsButton;
+}
+
 // ----------------------------
 
 MediaControlTimelineElement::MediaControlTimelineElement(HTMLMediaElement* mediaElement)
-    : MediaControlInputElement(mediaElement, MEDIA_CONTROLS_TIMELINE)
+    : MediaControlInputElement(mediaElement, MediaSlider)
 {
 }
 
@@ -756,10 +792,16 @@ void MediaControlTimelineElement::update(bool updateDuration)
     MediaControlInputElement::update();
 }
 
+AtomicString MediaControlTimelineElement::shadowPseudoId() const
+{
+    DEFINE_STATIC_LOCAL(AtomicString, timelineSlider, ("-webkit-media-controls-timeline"));
+    return timelineSlider;
+}
+
 // ----------------------------
 
 inline MediaControlVolumeSliderElement::MediaControlVolumeSliderElement(HTMLMediaElement* mediaElement)
-    : MediaControlInputElement(mediaElement, MEDIA_CONTROLS_VOLUME_SLIDER)
+    : MediaControlInputElement(mediaElement, MediaVolumeSlider)
 {
 }
 
@@ -800,10 +842,16 @@ void MediaControlVolumeSliderElement::update()
     MediaControlInputElement::update();
 }
 
+AtomicString MediaControlVolumeSliderElement::shadowPseudoId() const
+{
+    DEFINE_STATIC_LOCAL(AtomicString, volumeSlider, ("-webkit-media-controls-volume-slider"));
+    return volumeSlider;
+}
+
 // ----------------------------
 
 inline MediaControlFullscreenButtonElement::MediaControlFullscreenButtonElement(HTMLMediaElement* mediaElement)
-    : MediaControlInputElement(mediaElement, MEDIA_CONTROLS_FULLSCREEN_BUTTON)
+    : MediaControlInputElement(mediaElement, MediaFullscreenButton)
 {
 }
 
@@ -836,6 +884,12 @@ void MediaControlFullscreenButtonElement::defaultEventHandler(Event* event)
     HTMLInputElement::defaultEventHandler(event);
 }
 
+AtomicString MediaControlFullscreenButtonElement::shadowPseudoId() const
+{
+    DEFINE_STATIC_LOCAL(AtomicString, fullscreenButton, ("-webkit-media-controls-fullscreen-button"));
+    return fullscreenButton;
+}
+
 // ----------------------------
 
 inline MediaControlTimeDisplayElement::MediaControlTimeDisplayElement(HTMLMediaElement* mediaElement, PseudoId pseudo)
diff --git a/Source/WebCore/rendering/MediaControlElements.h b/Source/WebCore/rendering/MediaControlElements.h
index b2d063d..806150d 100644
--- a/Source/WebCore/rendering/MediaControlElements.h
+++ b/Source/WebCore/rendering/MediaControlElements.h
@@ -174,12 +174,10 @@ public:
     HTMLMediaElement* mediaElement() const { return m_mediaElement; }
 
 protected:
-    MediaControlInputElement(HTMLMediaElement*, PseudoId);
+    MediaControlInputElement(HTMLMediaElement*, MediaControlElementType);
 
     void setDisplayType(MediaControlElementType);
 
-    PseudoId pseudoStyleId() const { return m_pseudoStyleId; }
-
 private:
     virtual void attach();
     virtual bool rendererIsNeeded(RenderStyle*);
@@ -190,8 +188,7 @@ private:
 
     virtual void updateDisplayType() { }
 
-    HTMLMediaElement* m_mediaElement;   
-    PseudoId m_pseudoStyleId;
+    HTMLMediaElement* m_mediaElement;
     MediaControlElementType m_displayType;
 };
 
@@ -199,19 +196,33 @@ private:
 
 class MediaControlMuteButtonElement : public MediaControlInputElement {
 public:
-    enum ButtonLocation { Controller, VolumeSlider };
-    static PassRefPtr<MediaControlMuteButtonElement> create(HTMLMediaElement*, ButtonLocation);
+    static PassRefPtr<MediaControlMuteButtonElement> create(HTMLMediaElement*);
 
     virtual void defaultEventHandler(Event*);
 
-private:
-    MediaControlMuteButtonElement(HTMLMediaElement*, ButtonLocation);
+protected:
+    MediaControlMuteButtonElement(HTMLMediaElement*, MediaControlElementType);
 
+private:
     virtual void updateDisplayType();
+    virtual AtomicString shadowPseudoId() const;
 };
 
 // ----------------------------
 
+class MediaControlVolumeSliderMuteButtonElement : public MediaControlMuteButtonElement {
+public:
+    static PassRefPtr<MediaControlVolumeSliderMuteButtonElement> create(HTMLMediaElement*);
+
+private:
+    MediaControlVolumeSliderMuteButtonElement(HTMLMediaElement*);
+
+    virtual AtomicString shadowPseudoId() const;
+};
+
+
+// ----------------------------
+
 class MediaControlPlayButtonElement : public MediaControlInputElement {
 public:
     static PassRefPtr<MediaControlPlayButtonElement> create(HTMLMediaElement*);
@@ -222,20 +233,20 @@ private:
     MediaControlPlayButtonElement(HTMLMediaElement*);
 
     virtual void updateDisplayType();
+    virtual AtomicString shadowPseudoId() const;
 };
 
 // ----------------------------
 
 class MediaControlSeekButtonElement : public MediaControlInputElement {
 public:
-    static PassRefPtr<MediaControlSeekButtonElement> create(HTMLMediaElement*, PseudoId);
-
     virtual void defaultEventHandler(Event*);
 
-private:
-    MediaControlSeekButtonElement(HTMLMediaElement*, PseudoId);
+protected:
+    MediaControlSeekButtonElement(HTMLMediaElement*, MediaControlElementType);
 
-    bool isForwardButton() const;
+private:
+    virtual bool isForwardButton() const = 0;
 
     virtual void detach();
     void seekTimerFired(Timer<MediaControlSeekButtonElement>*);
@@ -244,7 +255,33 @@ private:
     bool m_capturing;
     Timer<MediaControlSeekButtonElement> m_seekTimer;
 };
-    
+
+// ----------------------------
+
+class MediaControlSeekForwardButtonElement : public MediaControlSeekButtonElement {
+public:
+    static PassRefPtr<MediaControlSeekForwardButtonElement> create(HTMLMediaElement*);
+
+private:
+    MediaControlSeekForwardButtonElement(HTMLMediaElement*);
+
+    virtual bool isForwardButton() const { return true; }
+    virtual AtomicString shadowPseudoId() const;
+};
+
+// ----------------------------
+
+class MediaControlSeekBackButtonElement : public MediaControlSeekButtonElement {
+public:
+    static PassRefPtr<MediaControlSeekBackButtonElement> create(HTMLMediaElement*);
+
+private:
+    MediaControlSeekBackButtonElement(HTMLMediaElement*);
+
+    virtual bool isForwardButton() const { return false; }
+    virtual AtomicString shadowPseudoId() const;
+};
+
 // ----------------------------
 
 class MediaControlRewindButtonElement : public MediaControlInputElement {
@@ -255,6 +292,8 @@ public:
 
 private:
     MediaControlRewindButtonElement(HTMLMediaElement*);
+
+    virtual AtomicString shadowPseudoId() const;
 };
 
 // ----------------------------
@@ -267,6 +306,8 @@ public:
 
 private:
     MediaControlReturnToRealtimeButtonElement(HTMLMediaElement*);
+
+    virtual AtomicString shadowPseudoId() const;
 };    
 
 // ----------------------------
@@ -281,6 +322,7 @@ private:
     MediaControlToggleClosedCaptionsButtonElement(HTMLMediaElement*);
 
     virtual void updateDisplayType();
+    virtual AtomicString shadowPseudoId() const;
 };    
 
 // ----------------------------
@@ -294,6 +336,8 @@ public:
 
 private:
     MediaControlTimelineElement(HTMLMediaElement*);
+
+    virtual AtomicString shadowPseudoId() const;
 };
 
 // ----------------------------
@@ -307,6 +351,8 @@ public:
 
 private:
     MediaControlVolumeSliderElement(HTMLMediaElement*);
+
+    virtual AtomicString shadowPseudoId() const;
 };
 
 // ----------------------------
@@ -319,6 +365,8 @@ public:
 
 private:
     MediaControlFullscreenButtonElement(HTMLMediaElement*);
+
+    virtual AtomicString shadowPseudoId() const;
 };
 
 // ----------------------------
diff --git a/Source/WebCore/rendering/RenderMedia.cpp b/Source/WebCore/rendering/RenderMedia.cpp
index 7da72db..70b1b33 100644
--- a/Source/WebCore/rendering/RenderMedia.cpp
+++ b/Source/WebCore/rendering/RenderMedia.cpp
@@ -190,7 +190,7 @@ void RenderMedia::createPanel()
 void RenderMedia::createMuteButton()
 {
     ASSERT(!m_muteButton);
-    m_muteButton = MediaControlMuteButtonElement::create(mediaElement(), MediaControlMuteButtonElement::Controller);
+    m_muteButton = MediaControlMuteButtonElement::create(mediaElement());
     m_muteButton->attachToParent(m_panel.get());
 }
 
@@ -204,14 +204,14 @@ void RenderMedia::createPlayButton()
 void RenderMedia::createSeekBackButton()
 {
     ASSERT(!m_seekBackButton);
-    m_seekBackButton = MediaControlSeekButtonElement::create(mediaElement(), MEDIA_CONTROLS_SEEK_BACK_BUTTON);
+    m_seekBackButton = MediaControlSeekBackButtonElement::create(mediaElement());
     m_seekBackButton->attachToParent(m_panel.get());
 }
 
 void RenderMedia::createSeekForwardButton()
 {
     ASSERT(!m_seekForwardButton);
-    m_seekForwardButton = MediaControlSeekButtonElement::create(mediaElement(), MEDIA_CONTROLS_SEEK_FORWARD_BUTTON);
+    m_seekForwardButton = MediaControlSeekForwardButtonElement::create(mediaElement());
     m_seekForwardButton->attachToParent(m_panel.get());
 }
 
@@ -278,7 +278,7 @@ void RenderMedia::createVolumeSlider()
 void RenderMedia::createVolumeSliderMuteButton()
 {
     ASSERT(!m_volumeSliderMuteButton);
-    m_volumeSliderMuteButton = MediaControlMuteButtonElement::create(mediaElement(), MediaControlMuteButtonElement::VolumeSlider);
+    m_volumeSliderMuteButton = MediaControlVolumeSliderMuteButtonElement::create(mediaElement());
     m_volumeSliderMuteButton->attachToParent(m_volumeSliderContainer.get());
     
 }
diff --git a/Source/WebCore/rendering/style/RenderStyleConstants.h b/Source/WebCore/rendering/style/RenderStyleConstants.h
index 7cd4903..633d482 100644
--- a/Source/WebCore/rendering/style/RenderStyleConstants.h
+++ b/Source/WebCore/rendering/style/RenderStyleConstants.h
@@ -69,11 +69,7 @@ enum PseudoId {
     // The order must be NOP ID, public IDs, and then internal IDs.
     NOPSEUDO, FIRST_LINE, FIRST_LETTER, BEFORE, AFTER, SELECTION, FIRST_LINE_INHERITED, SCROLLBAR, FILE_UPLOAD_BUTTON, INPUT_PLACEHOLDER,
     SEARCH_CANCEL_BUTTON, SEARCH_DECORATION, SEARCH_RESULTS_DECORATION, SEARCH_RESULTS_BUTTON, MEDIA_CONTROLS_PANEL,
-    MEDIA_CONTROLS_PLAY_BUTTON, MEDIA_CONTROLS_MUTE_BUTTON, MEDIA_CONTROLS_TIMELINE, MEDIA_CONTROLS_TIMELINE_CONTAINER,
-    MEDIA_CONTROLS_VOLUME_SLIDER, MEDIA_CONTROLS_VOLUME_SLIDER_CONTAINER, MEDIA_CONTROLS_VOLUME_SLIDER_MUTE_BUTTON, 
-    MEDIA_CONTROLS_CURRENT_TIME_DISPLAY, MEDIA_CONTROLS_TIME_REMAINING_DISPLAY, 
-    MEDIA_CONTROLS_SEEK_BACK_BUTTON, MEDIA_CONTROLS_SEEK_FORWARD_BUTTON, MEDIA_CONTROLS_FULLSCREEN_BUTTON, MEDIA_CONTROLS_REWIND_BUTTON, 
-    MEDIA_CONTROLS_RETURN_TO_REALTIME_BUTTON, MEDIA_CONTROLS_TOGGLE_CLOSED_CAPTIONS_BUTTON,
+    MEDIA_CONTROLS_TIMELINE_CONTAINER, MEDIA_CONTROLS_VOLUME_SLIDER_CONTAINER, MEDIA_CONTROLS_CURRENT_TIME_DISPLAY, MEDIA_CONTROLS_TIME_REMAINING_DISPLAY, 
     MEDIA_CONTROLS_STATUS_DISPLAY, SCROLLBAR_THUMB, SCROLLBAR_BUTTON, SCROLLBAR_TRACK, SCROLLBAR_TRACK_PIECE, SCROLLBAR_CORNER, RESIZER,
     INPUT_LIST_BUTTON, INPUT_SPEECH_BUTTON, INNER_SPIN_BUTTON, OUTER_SPIN_BUTTON, VISITED_LINK, PROGRESS_BAR_VALUE,
     METER_HORIZONTAL_BAR, METER_HORIZONTAL_OPTIMUM, METER_HORIZONTAL_SUBOPTIMAL, METER_HORIZONTAL_EVEN_LESS_GOOD,

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list