| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |    2  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 
|    3  * |    3  * | 
|    4  * This library is free software; you can redistribute it and/or |    4  * This library is free software; you can redistribute it and/or | 
|    5  * modify it under the terms of the GNU Library General Public |    5  * modify it under the terms of the GNU Library General Public | 
|    6  * License as published by the Free Software Foundation; either |    6  * License as published by the Free Software Foundation; either | 
|    7  * version 2 of the License, or (at your option) any later version. |    7  * version 2 of the License, or (at your option) any later version. | 
|    8  * |    8  * | 
|    9  * This library is distributed in the hope that it will be useful, |    9  * This library is distributed in the hope that it will be useful, | 
|   10  * but WITHOUT ANY WARRANTY; without even the implied warranty of |   10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   66 bool RenderProgress::isDeterminate() const |   66 bool RenderProgress::isDeterminate() const | 
|   67 { |   67 { | 
|   68     return (HTMLProgressElement::IndeterminatePosition != position() |   68     return (HTMLProgressElement::IndeterminatePosition != position() | 
|   69             && HTMLProgressElement::InvalidPosition != position()); |   69             && HTMLProgressElement::InvalidPosition != position()); | 
|   70 } |   70 } | 
|   71  |   71  | 
|   72 void RenderProgress::animationTimerFired(Timer<RenderProgress>*) |   72 void RenderProgress::animationTimerFired(Timer<RenderProgress>*) | 
|   73 { |   73 { | 
|   74     repaint(); |   74     repaint(); | 
|   75     if (!m_animationTimer.isActive() && m_animating) |   75     if (!m_animationTimer.isActive() && m_animating) | 
|   76         m_animationTimer.startOneShot(m_animationRepeatInterval); |   76         m_animationTimer.startOneShot(m_animationRepeatInterval, FROM_HERE); | 
|   77 } |   77 } | 
|   78  |   78  | 
|   79 void RenderProgress::updateAnimationState() |   79 void RenderProgress::updateAnimationState() | 
|   80 { |   80 { | 
|   81     m_animationDuration = RenderTheme::theme().animationDurationForProgressBar(t
     his); |   81     m_animationDuration = RenderTheme::theme().animationDurationForProgressBar(t
     his); | 
|   82     m_animationRepeatInterval = RenderTheme::theme().animationRepeatIntervalForP
     rogressBar(this); |   82     m_animationRepeatInterval = RenderTheme::theme().animationRepeatIntervalForP
     rogressBar(this); | 
|   83  |   83  | 
|   84     bool animating = style()->hasAppearance() && m_animationDuration > 0; |   84     bool animating = style()->hasAppearance() && m_animationDuration > 0; | 
|   85     if (animating == m_animating) |   85     if (animating == m_animating) | 
|   86         return; |   86         return; | 
|   87  |   87  | 
|   88     m_animating = animating; |   88     m_animating = animating; | 
|   89     if (m_animating) { |   89     if (m_animating) { | 
|   90         m_animationStartTime = currentTime(); |   90         m_animationStartTime = currentTime(); | 
|   91         m_animationTimer.startOneShot(m_animationRepeatInterval); |   91         m_animationTimer.startOneShot(m_animationRepeatInterval, FROM_HERE); | 
|   92     } else |   92     } else | 
|   93         m_animationTimer.stop(); |   93         m_animationTimer.stop(); | 
|   94 } |   94 } | 
|   95  |   95  | 
|   96 HTMLProgressElement* RenderProgress::progressElement() const |   96 HTMLProgressElement* RenderProgress::progressElement() const | 
|   97 { |   97 { | 
|   98     if (!node()) |   98     if (!node()) | 
|   99         return 0; |   99         return 0; | 
|  100  |  100  | 
|  101     if (node()->hasTagName(HTMLNames::progressTag)) |  101     if (node()->hasTagName(HTMLNames::progressTag)) | 
|  102         return toHTMLProgressElement(node()); |  102         return toHTMLProgressElement(node()); | 
|  103  |  103  | 
|  104     ASSERT(node()->shadowHost()); |  104     ASSERT(node()->shadowHost()); | 
|  105     return toHTMLProgressElement(node()->shadowHost()); |  105     return toHTMLProgressElement(node()->shadowHost()); | 
|  106 } |  106 } | 
|  107  |  107  | 
|  108 } // namespace WebCore |  108 } // namespace WebCore | 
| OLD | NEW |