Changeset 48822 in webkit

Timestamp:

Sep 28, 2009 11:43:54 AM (15 years ago)

Author:

eric@webkit.org

Message:

2009-09-28 Andrew Scherkus <​scherkus@chromium.org>

Reviewed by Eric Carlson.

Delegate implementation of rendererIsNeeded() for media control elements to RenderTheme.

​https://bugs.webkit.org/show_bug.cgi?id=28689

Covered by LayoutTests/media/video-no-audio.html

• rendering/MediaControlElements.cpp: Removed subclass implementations of rendererIsNeeded(). (WebCore::MediaControlElement::rendererIsNeeded): Include calling shouldRenderMediaControlPart(). (WebCore::MediaControlInputElement::rendererIsNeeded): Include calling shouldRenderMediaControlPart().
• rendering/MediaControlElements.h:
• rendering/RenderTheme.cpp: (WebCore::RenderTheme::shouldRenderMediaControlPart): New method. Contains logic moved from subclass implementations of rendererIsNeeded().
• rendering/RenderTheme.h:
• rendering/RenderThemeChromiumSkia.cpp: (WebCore::RenderThemeChromiumSkia::shouldRenderMediaControlPart): Override to always render mute button.
• rendering/RenderThemeChromiumSkia.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/MediaControlElements.cpp (modified) (6 diffs)
• rendering/MediaControlElements.h (modified) (5 diffs)
• rendering/RenderTheme.cpp (modified) (2 diffs)
• rendering/RenderTheme.h (modified) (1 diff)
• rendering/RenderThemeChromiumSkia.cpp (modified) (1 diff)
• rendering/RenderThemeChromiumSkia.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-28  Andrew Scherkus  <scherkus@chromium.org>
+
+        Reviewed by Eric Carlson.
+
+        Delegate implementation of rendererIsNeeded() for media control elements to RenderTheme.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28689
+
+        Covered by LayoutTests/media/video-no-audio.html
+
+        * rendering/MediaControlElements.cpp: Removed subclass implementations of rendererIsNeeded().
+        (WebCore::MediaControlElement::rendererIsNeeded): Include calling shouldRenderMediaControlPart().
+        (WebCore::MediaControlInputElement::rendererIsNeeded): Include calling shouldRenderMediaControlPart().
+        * rendering/MediaControlElements.h:
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::shouldRenderMediaControlPart): New method.  Contains logic moved from subclass implementations of rendererIsNeeded().
+        * rendering/RenderTheme.h:
+        * rendering/RenderThemeChromiumSkia.cpp:
+        (WebCore::RenderThemeChromiumSkia::shouldRenderMediaControlPart): Override to always render mute button.
+        * rendering/RenderThemeChromiumSkia.h:
+
 2009-09-28  Jian Li  <jianli@chromium.org>
 

trunk/WebCore/rendering/MediaControlElements.cpp

@@ -136 +136 @@
 bool MediaControlElement::rendererIsNeeded(RenderStyle* style)
 {
-    return HTMLDivElement::rendererIsNeeded(style) && parent() && parent()->renderer();
+    ASSERT(document()->page());
+
+    return HTMLDivElement::rendererIsNeeded(style) && parent() && parent()->renderer()
+        && document()->page()->theme()->shouldRenderMediaControlPart(style->appearance(), m_mediaElement);
 }
     
@@ -361 +364 @@
 bool MediaControlInputElement::rendererIsNeeded(RenderStyle* style)
 {
-    return HTMLInputElement::rendererIsNeeded(style) && parent() && parent()->renderer();
+    ASSERT(document()->page());
+
+    return HTMLInputElement::rendererIsNeeded(style) && parent() && parent()->renderer()
+        && document()->page()->theme()->shouldRenderMediaControlPart(style->appearance(), m_mediaElement);
 }
 
@@ -443 +449 @@
 {
     setDisplayType(m_mediaElement->muted() ? MediaUnMuteButton : MediaMuteButton);
-}
-
-bool MediaControlMuteButtonElement::disabled() const
-{
-    return !m_mediaElement->hasAudio();
-}
-
-bool MediaControlMuteButtonElement::rendererIsNeeded(RenderStyle* style)
-{
-    return MediaControlInputElement::rendererIsNeeded(style) && !disabled();
 }
 
@@ -552 +548 @@
 }
 
-bool MediaControlRewindButtonElement::rendererIsNeeded(RenderStyle* style)
-{
-    return MediaControlInputElement::rendererIsNeeded(style) && m_mediaElement->movieLoadType() != MediaPlayer::LiveStream;
-}
-
 
 // ----------------------------
@@ -574 +565 @@
 }
 
-bool MediaControlReturnToRealtimeButtonElement::rendererIsNeeded(RenderStyle* style)
-{
-    return MediaControlInputElement::rendererIsNeeded(style) && m_mediaElement->movieLoadType() == MediaPlayer::LiveStream;
-}
 
 // ----------------------------
@@ -663 +650 @@
     }
     HTMLInputElement::defaultEventHandler(event);
-}
-
-bool MediaControlFullscreenButtonElement::rendererIsNeeded(RenderStyle* style)
-{
-    return MediaControlInputElement::rendererIsNeeded(style) && m_mediaElement->supportsFullscreen();
 }
 

trunk/WebCore/rendering/MediaControlElements.h

@@ -156 +156 @@
     MediaControlElementType displayType() const { return m_displayType; }
 
-    // Some elements are disabled by movie state (eg. mute if no audio).
-    virtual bool disabled() const  { return false; }
-
     HTMLMediaElement* mediaElement() const { return m_mediaElement; }
     virtual bool isMediaControlElement() const { return true; }
@@ -178 +175 @@
     virtual void defaultEventHandler(Event*);
     virtual void updateDisplayType();
-    virtual bool disabled() const;
-    virtual bool rendererIsNeeded(RenderStyle*);
 };
 
@@ -213 +208 @@
     MediaControlRewindButtonElement(Document*, HTMLMediaElement*);
     virtual void defaultEventHandler(Event*);
-    virtual bool rendererIsNeeded(RenderStyle*);
 };
 
@@ -222 +216 @@
     MediaControlReturnToRealtimeButtonElement(Document*, HTMLMediaElement*);
     virtual void defaultEventHandler(Event*);
-    virtual bool rendererIsNeeded(RenderStyle*);
 };    
 
@@ -248 +241 @@
     MediaControlFullscreenButtonElement(Document*, HTMLMediaElement*);
     virtual void defaultEventHandler(Event*);
-    virtual bool rendererIsNeeded(RenderStyle*);
 };
 

trunk/WebCore/rendering/RenderTheme.cpp

@@ -31 +31 @@
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
+#include "MediaControlElements.h"
 #include "Page.h"
 #include "RenderStyle.h"
@@ -397 +398 @@
     return toRenderBox(o)->borderBoxRect().contains(roundedIntPoint(localPoint));
 }
+
+bool RenderTheme::shouldRenderMediaControlPart(ControlPart part, Element* e)
+{
+    HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(e);
+    switch (part) {
+    case MediaMuteButtonPart:
+        return mediaElement->hasAudio();
+    case MediaRewindButtonPart:
+        return mediaElement->movieLoadType() != MediaPlayer::LiveStream;
+    case MediaReturnToRealtimeButtonPart:
+        return mediaElement->movieLoadType() == MediaPlayer::LiveStream;
+    case MediaFullscreenButtonPart:
+        return mediaElement->supportsFullscreen();
+    default:
+        return true;
+    }
+}
 #endif
 

trunk/WebCore/rendering/RenderTheme.h

@@ -173 +173 @@
     // Media controls
     virtual bool hitTestMediaControlPart(RenderObject*, const IntPoint& absPoint);
+    virtual bool shouldRenderMediaControlPart(ControlPart, Element*);
 #endif
 

trunk/WebCore/rendering/RenderThemeChromiumSkia.cpp

@@ -869 +869 @@
 }
 
+#if ENABLE(VIDEO)
+bool RenderThemeChromiumSkia::shouldRenderMediaControlPart(ControlPart part, Element* e)
+{
+    HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(e);
+    switch (part) {
+    case MediaMuteButtonPart:
+        return true;
+    default:
+        return RenderTheme::shouldRenderMediaControlPart(part, e);
+    }
+}
+#endif
+
 // static
 void RenderThemeChromiumSkia::setDefaultFontSize(int fontSize)

trunk/WebCore/rendering/RenderThemeChromiumSkia.h

@@ -127 +127 @@
         virtual int buttonInternalPaddingBottom() const;
 
+#if ENABLE(VIDEO)
+        // Media controls
+        virtual bool shouldRenderMediaControlPart(ControlPart, Element*);
+#endif
+
         // Provide a way to pass the default font size from the Settings object
         // to the render theme.  FIXME: http://b/1129186 A cleaner way would be