Changeset 80242 in webkit

Timestamp:

Mar 3, 2011 8:40:02 AM (13 years ago)

Author:

Dimitri Glazkov

Message:

2011-03-03 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Eric Carlson.

Tweak MediaControlMuteButtonElement class hierarchy.
​https://bugs.webkit.org/show_bug.cgi?id=55614

This allows the mute button on the panel to have event handlers that are
different from the mute button in the volume slider.

No change in behavior, covered by existing tests.

• html/shadow/MediaControls.cpp: (WebCore::MediaControls::createMuteButton): Changed to use MediaControlPanelMuteButtonElement.
• rendering/MediaControlElements.cpp: (WebCore::MediaControlMuteButtonElement::updateDisplayType): (WebCore::MediaControlPanelMuteButtonElement::MediaControlPanelMuteButtonElement): Added. (WebCore::MediaControlPanelMuteButtonElement::create): Added. (WebCore::MediaControlPanelMuteButtonElement::shadowPseudoId): Moved.
• rendering/MediaControlElements.h: Added defs.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/shadow/MediaControls.cpp (modified) (1 diff)
• rendering/MediaControlElements.cpp (modified) (3 diffs)
• rendering/MediaControlElements.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-03  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Eric Carlson.
+
+        Tweak MediaControlMuteButtonElement class hierarchy.
+        https://bugs.webkit.org/show_bug.cgi?id=55614
+
+        This allows the mute button on the panel to have event handlers that are
+        different from the mute button in the volume slider.
+
+        No change in behavior, covered by existing tests.
+
+        * html/shadow/MediaControls.cpp:
+        (WebCore::MediaControls::createMuteButton): Changed to use MediaControlPanelMuteButtonElement.
+        * rendering/MediaControlElements.cpp:
+        (WebCore::MediaControlMuteButtonElement::updateDisplayType):
+        (WebCore::MediaControlPanelMuteButtonElement::MediaControlPanelMuteButtonElement): Added.
+        (WebCore::MediaControlPanelMuteButtonElement::create): Added.
+        (WebCore::MediaControlPanelMuteButtonElement::shadowPseudoId): Moved.
+        * rendering/MediaControlElements.h: Added defs.
+
 2011-03-03  Yury Semikhatsky  <yurys@chromium.org>
 

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

@@ -247 +247 @@
 {
     ASSERT(!m_muteButton);
-    m_muteButton = MediaControlMuteButtonElement::create(m_mediaElement);
+    m_muteButton = MediaControlPanelMuteButtonElement::create(m_mediaElement);
     m_muteButton->attachToParent(m_panel.get());
 }

trunk/Source/WebCore/rendering/MediaControlElements.cpp

@@ -488 +488 @@
 }
 
-PassRefPtr<MediaControlMuteButtonElement> MediaControlMuteButtonElement::create(HTMLMediaElement* mediaElement)
-{
-    RefPtr<MediaControlMuteButtonElement> button = adoptRef(new MediaControlMuteButtonElement(mediaElement, MediaMuteButton));
-    button->setType("button");
-    return button.release();
-}
-
 void MediaControlMuteButtonElement::defaultEventHandler(Event* event)
 {
@@ -504 +497 @@
 }
 
-const AtomicString& MediaControlMuteButtonElement::shadowPseudoId() const
+void MediaControlMuteButtonElement::updateDisplayType()
+{
+    setDisplayType(mediaElement()->muted() ? MediaUnMuteButton : MediaMuteButton);
+}
+
+// ----------------------------
+
+inline MediaControlPanelMuteButtonElement::MediaControlPanelMuteButtonElement(HTMLMediaElement* mediaElement)
+    : MediaControlMuteButtonElement(mediaElement, MediaMuteButton)
+{
+}
+
+PassRefPtr<MediaControlPanelMuteButtonElement> MediaControlPanelMuteButtonElement::create(HTMLMediaElement* mediaElement)
+{
+    RefPtr<MediaControlPanelMuteButtonElement> button = adoptRef(new MediaControlPanelMuteButtonElement(mediaElement));
+    button->setType("button");
+    return button.release();
+}
+
+const AtomicString& MediaControlPanelMuteButtonElement::shadowPseudoId() const
 {
     DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-mute-button"));
@@ -510 +522 @@
 }
 
-void MediaControlMuteButtonElement::updateDisplayType()
-{
-    setDisplayType(mediaElement()->muted() ? MediaUnMuteButton : MediaMuteButton);
-}
+// ----------------------------
 
 inline MediaControlVolumeSliderMuteButtonElement::MediaControlVolumeSliderMuteButtonElement(HTMLMediaElement* mediaElement)

trunk/Source/WebCore/rendering/MediaControlElements.h

@@ -211 +211 @@
 class MediaControlMuteButtonElement : public MediaControlInputElement {
 public:
-    static PassRefPtr<MediaControlMuteButtonElement> create(HTMLMediaElement*);
-
     virtual void defaultEventHandler(Event*);
 
@@ -220 +218 @@
 private:
     virtual void updateDisplayType();
+};
+
+// ----------------------------
+
+class MediaControlPanelMuteButtonElement : public MediaControlMuteButtonElement {
+public:
+    static PassRefPtr<MediaControlPanelMuteButtonElement> create(HTMLMediaElement*);
+
+private:
+    MediaControlPanelMuteButtonElement(HTMLMediaElement*);
+
     virtual const AtomicString& shadowPseudoId() const;
 };