OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 1597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1608 } | 1608 } |
1609 | 1609 |
1610 void HTMLMediaElement::playbackProgressTimerFired(Timer<HTMLMediaElement>*) | 1610 void HTMLMediaElement::playbackProgressTimerFired(Timer<HTMLMediaElement>*) |
1611 { | 1611 { |
1612 ASSERT(m_player); | 1612 ASSERT(m_player); |
1613 if (!m_playbackRate) | 1613 if (!m_playbackRate) |
1614 return; | 1614 return; |
1615 | 1615 |
1616 scheduleTimeupdateEvent(true); | 1616 scheduleTimeupdateEvent(true); |
1617 if (hasMediaControls()) { | 1617 if (hasMediaControls()) { |
1618 if (!m_mouseOver && controls()) | 1618 if (!m_mouseOver && controls() && hasVideo()) |
1619 mediaControls()->makeTransparent(); | 1619 mediaControls()->makeTransparent(); |
1620 mediaControls()->playbackProgressed(); | 1620 mediaControls()->playbackProgressed(); |
1621 } | 1621 } |
1622 // FIXME: deal with cue ranges here | 1622 // FIXME: deal with cue ranges here |
1623 } | 1623 } |
1624 | 1624 |
1625 void HTMLMediaElement::scheduleTimeupdateEvent(bool periodicEvent) | 1625 void HTMLMediaElement::scheduleTimeupdateEvent(bool periodicEvent) |
1626 { | 1626 { |
1627 double now = WTF::currentTime(); | 1627 double now = WTF::currentTime(); |
1628 double timedelta = now - m_lastTimeUpdateEventWallTime; | 1628 double timedelta = now - m_lastTimeUpdateEventWallTime; |
(...skipping 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2689 } else if (hasMediaControls()) | 2689 } else if (hasMediaControls()) |
2690 mediaControls()->hide(); | 2690 mediaControls()->hide(); |
2691 } | 2691 } |
2692 return 0; | 2692 return 0; |
2693 } | 2693 } |
2694 | 2694 |
2695 | 2695 |
2696 } | 2696 } |
2697 | 2697 |
2698 #endif | 2698 #endif |
OLD | NEW |