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 * Copyright (C) 2011 Google Inc. All rights reserved. | 3 * Copyright (C) 2011 Google Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
525 { | 525 { |
526 m_hideFullscreenControlsTimer.stop(); | 526 m_hideFullscreenControlsTimer.stop(); |
527 } | 527 } |
528 | 528 |
529 const AtomicString& MediaControlRootElement::shadowPseudoId() const | 529 const AtomicString& MediaControlRootElement::shadowPseudoId() const |
530 { | 530 { |
531 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls")); | 531 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls")); |
532 return id; | 532 return id; |
533 } | 533 } |
534 | 534 |
| 535 void MediaControlRootElement::bufferingProgressed() |
| 536 { |
| 537 // We only need to update buffering progress when paused, during normal |
| 538 // playback playbackProgressed() will take care of it. |
| 539 if (m_mediaElement->paused()) |
| 540 m_timeline->setPosition(m_mediaElement->currentTime()); |
| 541 } |
| 542 |
535 } | 543 } |
536 | 544 |
537 #endif | 545 #endif |
OLD | NEW |