Changeset 56850 in webkit

Timestamp:

Mar 31, 2010 10:06:57 AM (14 years ago)

Author:

yael.aharon@nokia.com

Message:

Add animation to progress element
​https://bugs.webkit.org/show_bug.cgi?id=36664

Reviewed by Antti Koivisto.

Add a timer to control the animation. The timer is started after painting
or a state change in the progress bar, to prevent animation from running
when the progress bar is not visible.

• html/HTMLProgressElement.cpp:
• platform/qt/RenderThemeQt.cpp:
• platform/qt/RenderThemeQt.h:
• rendering/RenderProgress.cpp:
• rendering/RenderProgress.h:
• rendering/RenderTheme.cpp:
• rendering/RenderTheme.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLProgressElement.cpp (modified) (1 diff)
• manual-tests/dom (added)
• manual-tests/dom/progressbar.html (added)
• platform/qt/RenderThemeQt.cpp (modified) (2 diffs)
• platform/qt/RenderThemeQt.h (modified) (2 diffs)
• rendering/RenderProgress.cpp (modified) (3 diffs)
• rendering/RenderProgress.h (modified) (2 diffs)
• rendering/RenderTheme.cpp (modified) (1 diff)
• rendering/RenderTheme.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-31  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Antti Koivisto.
+
+        Add animation to progress element
+        https://bugs.webkit.org/show_bug.cgi?id=36664
+
+        Add a timer to control the animation. The timer is started after painting
+        or a state change in the progress bar, to prevent animation from running
+        when the progress bar is not visible.
+
+        * html/HTMLProgressElement.cpp:
+        (WebCore::HTMLProgressElement::createRenderer):
+        * manual-tests/dom: Added.
+        * manual-tests/dom/progressbar.html: Added.
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::animationRepeatIntervalForProgressBar):
+        (WebCore::RenderThemeQt::animationDurationForProgressBar):
+        (WebCore::RenderThemeQt::paintProgressBar):
+        * platform/qt/RenderThemeQt.h:
+        * rendering/RenderProgress.cpp:
+        (WebCore::RenderProgress::RenderProgress):
+        (WebCore::RenderProgress::layout):
+        (WebCore::RenderProgress::updateFromElement):
+        (WebCore::RenderProgress::animationProgress):
+        (WebCore::RenderProgress::animationTimerFired):
+        (WebCore::RenderProgress::paint):
+        (WebCore::RenderProgress::updateAnimationState):
+        * rendering/RenderProgress.h:
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::animationRepeatIntervalForProgressBar):
+        (WebCore::RenderTheme::animationDurationForProgressBar):
+        * rendering/RenderTheme.h:
+
 2010-03-31  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/html/HTMLProgressElement.cpp

@@ -46 +46 @@
 }
 
-RenderObject* HTMLProgressElement::createRenderer(RenderArena* arena, RenderStyle* style)
+RenderObject* HTMLProgressElement::createRenderer(RenderArena* arena, RenderStyle*)
 {
     return new (arena) RenderProgress(this);

trunk/WebCore/platform/qt/RenderThemeQt.cpp

@@ -654 +654 @@
 
 #if ENABLE(PROGRESS_TAG)
-bool RenderThemeQt::getNumberOfPixelsForProgressPosition(double position, int& progressSize) const
-{
-    progressSize = 65536 * position;
-    return false;
+double RenderThemeQt::animationRepeatIntervalForProgressBar(RenderProgress* renderProgress) const
+{
+    if (renderProgress->position() >= 0)
+        return 0;
+
+    // FIXME: Use hard-coded value until http://bugreports.qt.nokia.com/browse/QTBUG-9171 is fixed.
+    // Use the value from windows style which is 10 fps.
+    return 0.1;
+}
+
+double RenderThemeQt::animationDurationForProgressBar(RenderProgress* renderProgress) const
+{
+    if (renderProgress->position() >= 0)
+        return 0;
+
+    QStyleOptionProgressBarV2 option;
+    option.rect.setSize(renderProgress->size());
+    // FIXME: Until http://bugreports.qt.nokia.com/browse/QTBUG-9171 is fixed,
+    // we simulate one square animating across the progress bar.
+    return (option.rect.width() / qStyle()->pixelMetric(QStyle::PM_ProgressBarChunkWidth, &option)) * animationRepeatIntervalForProgressBar(renderProgress);
 }
 
@@ -687 +703 @@
     option.rect.setSize(r.size());
 
-    p.drawControl(QStyle::CE_ProgressBar, option);
+    if (option.progress < 0) {
+        // FIXME: Until http://bugreports.qt.nokia.com/browse/QTBUG-9171 is fixed,
+        // we simulate one square animating across the progress bar.
+        p.drawControl(QStyle::CE_ProgressBarGroove, option);
+        int chunkWidth = qStyle()->pixelMetric(QStyle::PM_ProgressBarChunkWidth, &option);
+        QColor color = (option.palette.highlight() == option.palette.background()) ? option.palette.color(QPalette::Active, QPalette::Highlight) : option.palette.color(QPalette::Highlight);
+        if (renderProgress->style()->direction() == RTL)
+            p.painter->fillRect(option.rect.right() - chunkWidth  - renderProgress->animationProgress() * option.rect.width(), 0, chunkWidth, option.rect.height(), color);
+        else
+            p.painter->fillRect(renderProgress->animationProgress() * option.rect.width(), 0, chunkWidth, option.rect.height(), color);
+    } else
+        p.drawControl(QStyle::CE_ProgressBar, option);
+
     p.painter->translate(-topLeft);
 

trunk/WebCore/platform/qt/RenderThemeQt.h

@@ -35 +35 @@
 namespace WebCore {
 
+#if ENABLE(PROGRESS_TAG)
+class RenderProgress;
+#endif
 class RenderStyle;
 class HTMLMediaElement;
@@ -129 +132 @@
 
 #if ENABLE(PROGRESS_TAG)
-    // Helper method for optimizing the paint area of the progress bar.
-    // If supported, it returns number of pixels needed to draw the progress bar up to the progress position.
-    // progressSize is the value that is passed back to RenderTheme during drawing.
-    virtual bool getNumberOfPixelsForProgressPosition(double position, int& progressSize) const;
+    // Returns the repeat interval of the animation for the progress bar.
+    virtual double animationRepeatIntervalForProgressBar(RenderProgress* renderProgress) const;
+    // Returns the duration of the animation for the progress bar.
+    virtual double animationDurationForProgressBar(RenderProgress* renderProgress) const;
 #endif
 

trunk/WebCore/rendering/RenderProgress.cpp

@@ -36 +36 @@
     : RenderBlock(element)
     , m_position(-1)
+    , m_animationStartTime(0)
+    , m_animationRepeatInterval(0)
+    , m_animationDuration(0)
+    , m_animating(false)
+    , m_animationTimer(this, &RenderProgress::animationTimerFired)
 {
 }
@@ -50 +55 @@
     m_overflow.clear();
 
+    updateAnimationState();
+
     repainter.repaintAfterLayout();
 
@@ -62 +69 @@
     m_position = element->position();
 
+    updateAnimationState();
+
     repaint();
+}
+
+double RenderProgress::animationProgress()
+{
+    return m_animating ? (fmod((currentTime() - m_animationStartTime), m_animationDuration) / m_animationDuration) : 0;
+}
+
+void RenderProgress::animationTimerFired(Timer<RenderProgress>*)
+{
+    repaint();
+}
+
+void RenderProgress::paint(PaintInfo& paintInfo, int tx, int ty)
+{
+    if (paintInfo.phase == PaintPhaseBlockBackground) {
+        if (!m_animationTimer.isActive() && m_animating)
+            m_animationTimer.startOneShot(m_animationRepeatInterval);
+    }
+
+    RenderBlock::paint(paintInfo, tx, ty);
+}
+
+void RenderProgress::updateAnimationState()
+{
+    m_animationDuration = theme()->animationDurationForProgressBar(this);
+    m_animationRepeatInterval = theme()->animationRepeatIntervalForProgressBar(this);
+
+    bool animating = m_animationDuration > 0;
+    if (animating == m_animating)
+        return;
+
+    m_animating = animating;
+    if (m_animating) {
+        m_animationStartTime = currentTime();
+        m_animationTimer.startOneShot(m_animationRepeatInterval);
+    } else
+        m_animationTimer.stop();
 }
 

trunk/WebCore/rendering/RenderProgress.h

@@ -33 +33 @@
     RenderProgress(HTMLProgressElement*);
     double position() { return m_position; }
+    double animationProgress();
 
 private:
@@ -39 +40 @@
     virtual void layout();
     virtual void updateFromElement();
+    virtual void paint(PaintInfo&, int tx, int ty);
+
+    void animationTimerFired(Timer<RenderProgress>*);
+    void updateAnimationState();
+
     double m_position;
+    double m_animationStartTime;
+    double m_animationRepeatInterval;
+    double m_animationDuration;
+    bool m_animating;
+    Timer<RenderProgress> m_animationTimer;
 };
 

trunk/WebCore/rendering/RenderTheme.cpp

@@ -841 +841 @@
 
 #if ENABLE(PROGRESS_TAG)
-bool RenderTheme::getNumberOfPixelsForProgressPosition(double , int& progressSize) const
-{
-    progressSize = 0;
-    return false;
+double RenderTheme::animationRepeatIntervalForProgressBar(RenderProgress*) const
+{
+    return 0;
+}
+
+double RenderTheme::animationDurationForProgressBar(RenderProgress*) const
+{
+    return 0;
 }
 

trunk/WebCore/rendering/RenderTheme.h

@@ -40 +40 @@
 class PopupMenu;
 class RenderMenuList;
+#if ENABLE(PROGRESS_TAG)
+class RenderProgress;
+#endif
 class CSSStyleSheet;
 
@@ -171 +174 @@
 
 #if ENABLE(PROGRESS_TAG)
-    // Helper method for optimizing the paint area of the progress bar.
-    // If supported, it returns number of pixels needed to draw the progress bar up to the progress position.
-    // progressSize is the value that is passed back to RenderTheme during drawing.
-    virtual bool getNumberOfPixelsForProgressPosition(double position, int& progressSize) const;
+    // Returns the repeat interval of the animation for the progress bar.
+    virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const;
+    // Returns the duration of the animation for the progress bar.
+    virtual double animationDurationForProgressBar(RenderProgress*) const;
 #endif