Changeset 53966 in webkit

Timestamp:

Jan 27, 2010 6:55:55 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-27 Nicholas Young <​nicholas.young@nokia.com>

Reviewed by Eric Carlson.

Make media controls fade in/out transition duration configurable on a theme level.
​https://bugs.webkit.org/show_bug.cgi?id=34196

No new tests needed (I hope).

• rendering/RenderMedia.cpp: (WebCore::RenderMedia::RenderMedia): Removed constant from contructor - the initial value is meaningless. (WebCore::RenderMedia::updateControlVisibility): Get fade in/out duration from theme.
• rendering/RenderTheme.h: (WebCore::RenderTheme::mediaControlsFadeInDuration): New virtual method. (WebCore::RenderTheme::mediaControlsFadeOutDuration): New virtual method.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderMedia.cpp (modified) (4 diffs)
• rendering/RenderTheme.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-27  Nicholas Young  <nicholas.young@nokia.com>
+
+        Reviewed by Eric Carlson.
+
+        Make media controls fade in/out transition duration configurable on a theme level.
+        https://bugs.webkit.org/show_bug.cgi?id=34196
+
+        No new tests needed (I hope).
+
+        * rendering/RenderMedia.cpp:
+        (WebCore::RenderMedia::RenderMedia): Removed constant from contructor - the initial value is meaningless.
+        (WebCore::RenderMedia::updateControlVisibility): Get fade in/out duration from theme.
+        * rendering/RenderTheme.h:
+        (WebCore::RenderTheme::mediaControlsFadeInDuration): New virtual method.
+        (WebCore::RenderTheme::mediaControlsFadeOutDuration): New virtual method.
+
 2010-01-27  John Abd-El-Malek  <jam@chromium.org>
 

trunk/WebCore/rendering/RenderMedia.cpp

@@ -46 +46 @@
 static const double cTimeUpdateRepeatDelay = 0.2;
 static const double cOpacityAnimationRepeatDelay = 0.05;
-// FIXME get this from style
-static const double cOpacityAnimationDurationFadeIn = 0.1;
-static const double cOpacityAnimationDurationFadeOut = 0.3;
 
 RenderMedia::RenderMedia(HTMLMediaElement* video)
@@ -56 +53 @@
     , m_mouseOver(false)
     , m_opacityAnimationStartTime(0)
-    , m_opacityAnimationDuration(cOpacityAnimationDurationFadeIn)
+    , m_opacityAnimationDuration(0)
     , m_opacityAnimationFrom(0)
     , m_opacityAnimationTo(1.0f)
@@ -68 +65 @@
     , m_mouseOver(false)
     , m_opacityAnimationStartTime(0)
-    , m_opacityAnimationDuration(cOpacityAnimationDurationFadeIn)
+    , m_opacityAnimationDuration(0)
     , m_opacityAnimationFrom(0)
     , m_opacityAnimationTo(1.0f)
@@ -454 +451 @@
 
     if (animateFrom < animateTo)
-        m_opacityAnimationDuration = cOpacityAnimationDurationFadeIn;
+        m_opacityAnimationDuration = m_panel->renderer()->theme()->mediaControlsFadeInDuration();
     else
-        m_opacityAnimationDuration = cOpacityAnimationDurationFadeOut;
+        m_opacityAnimationDuration = m_panel->renderer()->theme()->mediaControlsFadeOutDuration();
 
     m_opacityAnimationFrom = animateFrom;

trunk/WebCore/rendering/RenderTheme.h

@@ -174 +174 @@
     virtual bool hitTestMediaControlPart(RenderObject*, const IntPoint& absPoint);
     virtual bool shouldRenderMediaControlPart(ControlPart, Element*);
+    virtual double mediaControlsFadeInDuration() { return 0.1; }
+    virtual double mediaControlsFadeOutDuration() { return 0.3; }
 #endif