Changeset 44738 in webkit

Timestamp:

Jun 16, 2009 2:08:19 PM (15 years ago)

Author:

eric.carlson@apple.com

Message:

2009-06-16 Eric Carlson <​eric.carlson@apple.com>

Reviewed by Simon Fraser.

Fix for <rdar://problem/6890126> Theme code should fetch the MediaControlElementType from
the MediaControlInputElement, rather than computing it again

• html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::percentLoaded): New, utility function for controller implementation.
• html/HTMLMediaElement.h:

• rendering/MediaControlElements.h: (WebCore::MediaControlInputElement::displayType): New, return m_displayType.

• rendering/RenderMediaControls.cpp: (WebCore::RenderMediaControls::paintMediaControlsPart): Stop using MediaPlayer object, get button state from the button itself and get movie state from HTMLMediaElement.

• rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::paintMediaMuteButton): Get state from button instead of MediaPlayer. (WebCore::RenderThemeMac::paintMediaPlayButton): Ditto.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (1 diff)
• html/HTMLMediaElement.h (modified) (1 diff)
• rendering/MediaControlElements.h (modified) (1 diff)
• rendering/RenderMediaControls.cpp (modified) (2 diffs)
• rendering/RenderThemeMac.mm (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-06-16  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Fix for <rdar://problem/6890126> Theme code should fetch the MediaControlElementType from 
+        the MediaControlInputElement, rather than computing it again
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::percentLoaded): New, utility function for controller implementation.
+        * html/HTMLMediaElement.h:
+
+        * rendering/MediaControlElements.h:
+        (WebCore::MediaControlInputElement::displayType): New, return m_displayType.
+
+        * rendering/RenderMediaControls.cpp:
+        (WebCore::RenderMediaControls::paintMediaControlsPart): Stop using MediaPlayer object, get button
+        state from the button itself and get movie state from HTMLMediaElement.
+
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::paintMediaMuteButton): Get state from button instead of MediaPlayer.
+        (WebCore::RenderThemeMac::paintMediaPlayButton): Ditto.
+
 2009-06-16  Jian Li  <jianli@chromium.org>
 

trunk/WebCore/html/HTMLMediaElement.cpp

@@ -1131 +1131 @@
 }
 
+float HTMLMediaElement::percentLoaded() const
+{
+    if (!m_player)
+        return 0;
+    float duration = m_player->duration();
+    return duration ? m_player->maxTimeBuffered() / duration : 0;
+}
+
 bool HTMLMediaElement::havePotentialSourceChild()
 {

trunk/WebCore/html/HTMLMediaElement.h

@@ -132 +132 @@
     bool canPlay() const;
 
+    float percentLoaded() const;
+
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
     void setNeedWidgetUpdate(bool needWidgetUpdate) { m_needWidgetUpdate = needWidgetUpdate; }

trunk/WebCore/rendering/MediaControlElements.h

@@ -94 +94 @@
     void updateStyle();
     bool hitTest(const IntPoint& absPoint);
+    MediaControlElementType displayType() const { return m_displayType; }
 
 protected:

trunk/WebCore/rendering/RenderMediaControls.cpp

@@ -102 +102 @@
         case MediaMuteButton:
         case MediaUnMuteButton:
-            if (HTMLMediaElement* mediaElement = parentMediaElement(o))
-                paintThemePart(mediaElement->muted() ? SafariTheme::MediaUnMuteButtonPart : SafariTheme::MediaMuteButtonPart, paintInfo.context->platformContext(), r, NSRegularControlSize, determineState(o));
+            if (MediaControlMuteButtonElement* btn = static_cast<MediaControlMuteButtonElement*>(o->node())) {
+                bool audioEnabled = btn->displayType() == MediaMuteButton;
+                paintThemePart(audioEnabled ? SafariTheme::MediaMuteButtonPart : SafariTheme::MediaUnMuteButtonPart, paintInfo.context->platformContext(), r, NSRegularControlSize, determineState(o));
+            }
             break;
         case MediaPauseButton:
         case MediaPlayButton:
-            if (HTMLMediaElement* mediaElement = parentMediaElement(o))
-                paintThemePart(mediaElement->canPlay() ? SafariTheme::MediaPlayButtonPart : SafariTheme::MediaPauseButtonPart, paintInfo.context->platformContext(), r, NSRegularControlSize, determineState(o));
+            if (MediaControlPlayButtonElement* btn = static_cast<MediaControlPlayButtonElement*>(o->node())) {
+                bool currentlyPlaying = btn->displayType() == MediaPlayButton;
+                paintThemePart(currentlyPlaying ? SafariTheme::MediaPauseButtonPart : SafariTheme::MediaPlayButtonPart, paintInfo.context->platformContext(), r, NSRegularControlSize, determineState(o));
+            }
             break;
         case MediaSeekBackButton:
@@ -117 +121 @@
             break;
         case MediaSlider: {
-            HTMLMediaElement* mediaElement = parentMediaElement(o);
-            if (!mediaElement)
-                break;
-
-            MediaPlayer* player = mediaElement->player();
-            float duration = player ? player->duration() : 0;
-            float percentLoaded = duration ? player->maxTimeBuffered() /duration : 0;
-
-            STPaintProgressIndicator(SafariTheme::MediaType, paintInfo.context->platformContext(), r, NSRegularControlSize, 0, percentLoaded);
+            if (HTMLMediaElement* mediaElement = parentMediaElement(o))
+                STPaintProgressIndicator(SafariTheme::MediaType, paintInfo.context->platformContext(), r, NSRegularControlSize, 0, mediaElement->percentLoaded());
             break;
         }

trunk/WebCore/rendering/RenderThemeMac.mm

@@ -1479 +1479 @@
         return false;
 
-    HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(mediaNode);
-    if (!mediaElement)
-        return false;
-    
-    LocalCurrentGraphicsContext localContext(paintInfo.context);
-    wkDrawMediaUIPart(mediaElement->muted() ? MediaUnMuteButton : MediaMuteButton, mediaControllerTheme(), paintInfo.context->platformContext(), r, node->active());
+    if (MediaControlPlayButtonElement* btn = static_cast<MediaControlPlayButtonElement*>(node)) {
+        LocalCurrentGraphicsContext localContext(paintInfo.context);
+        wkDrawMediaUIPart(btn->displayType(), mediaControllerTheme(), paintInfo.context->platformContext(), r, node->active());
+    }
     return false;
 }
@@ -1495 +1493 @@
         return false;
 
-    HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(mediaNode);
-    if (!mediaElement)
-        return false;
-
-    LocalCurrentGraphicsContext localContext(paintInfo.context);
-    wkDrawMediaUIPart(mediaElement->canPlay() ? MediaPlayButton : MediaPauseButton, mediaControllerTheme(), paintInfo.context->platformContext(), r, node->active());
+    if (MediaControlPlayButtonElement* btn = static_cast<MediaControlPlayButtonElement*>(node)) {
+        LocalCurrentGraphicsContext localContext(paintInfo.context);
+        wkDrawMediaUIPart(btn->displayType(), mediaControllerTheme(), paintInfo.context->platformContext(), r, node->active());
+    }
     return false;
 }