Changeset 37470 in webkit

Timestamp:

Oct 9, 2008 9:04:15 PM (16 years ago)

Author:

eric.carlson@apple.com

Message:

2008-10-09 Eric Carlson <​eric.carlson@apple.com>

Media controls should not show when element is not visible

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

Reviewed by Adele Peterson.

• html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::recalcStyle): New, call renderer()->updateFromElement to stay in sync with visibility changes
• html/HTMLMediaElement.h:
• rendering/RenderMedia.cpp: (WebCore::RenderMedia::RenderMedia): initialize m_previousVisible (WebCore::RenderMedia::updateControlVisibility): consider style()->visibility() when determining if element is visible or not. Don't animate controller visibility when change triggered by showing or hiding media element.
• rendering/RenderMedia.h: declare m_previousVisible

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (1 diff)
• html/HTMLMediaElement.h (modified) (1 diff)
• rendering/RenderMedia.cpp (modified) (2 diffs)
• rendering/RenderMedia.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-10-09  Eric Carlson  <eric.carlson@apple.com>
+
+        Media controls should not show when element is not visible
+
+        https://bugs.webkit.org/show_bug.cgi?id=21155
+        
+        Reviewed by Adele Peterson.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::recalcStyle): New, call renderer()->updateFromElement to stay
+        in sync with visibility changes
+        * html/HTMLMediaElement.h:
+        * rendering/RenderMedia.cpp:
+        (WebCore::RenderMedia::RenderMedia): initialize m_previousVisible
+        (WebCore::RenderMedia::updateControlVisibility): consider style()->visibility() when determining
+        if element is visible or not. Don't animate controller visibility when change triggered by
+        showing or hiding media element.
+        * rendering/RenderMedia.h: declare m_previousVisible
+
 2008-10-09  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/html/HTMLMediaElement.cpp

@@ -153 +153 @@
 }
 
+void HTMLMediaElement::recalcStyle(StyleChange change)
+{
+    HTMLElement::recalcStyle(change);
+
+    if (renderer())
+        renderer()->updateFromElement();
+}
+
 void HTMLMediaElement::scheduleLoad()
 {

trunk/WebCore/html/HTMLMediaElement.h

@@ -54 +54 @@
     virtual void removedFromDocument();
     virtual void attach();
+    virtual void recalcStyle(StyleChange);
     
     MediaPlayer* player() const { return m_player.get(); }

trunk/WebCore/rendering/RenderMedia.cpp

@@ -62 +62 @@
     , m_opacityAnimationFrom(0)
     , m_opacityAnimationTo(1.0f)
+    , m_previousVisible(VISIBLE)
 {
 }
@@ -313 +314 @@
         return;
     // do fading manually, css animations don't work well with shadow trees
-    bool visible = m_mouseOver || media->paused() || media->ended() || media->networkState() < HTMLMediaElement::LOADED_METADATA;
+    bool visible = style()->visibility() == VISIBLE && (m_mouseOver || media->paused() || media->ended() || media->networkState() < HTMLMediaElement::LOADED_METADATA);
     if (visible == (m_opacityAnimationTo > 0))
         return;
+
+    if (style()->visibility() != m_previousVisible) {
+        // don't fade gradually if it the element has just changed visibility
+        m_previousVisible = style()->visibility();
+        m_opacityAnimationTo = m_previousVisible == VISIBLE ? 1.0f : 0;
+        changeOpacity(m_panel.get(), 0);
+        return;
+    }
+
     if (visible) {
         m_opacityAnimationFrom = m_panel->renderer()->style()->opacity();

trunk/WebCore/rendering/RenderMedia.h

@@ -110 +110 @@
     float m_opacityAnimationFrom;
     float m_opacityAnimationTo;
+    EVisibility m_previousVisible;
 };