| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010 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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 | 283 |
| 284 m_volumeSliderContainer->show(); | 284 m_volumeSliderContainer->show(); |
| 285 } | 285 } |
| 286 | 286 |
| 287 const AtomicString& MediaControlRootElementChromium::shadowPseudoId() const | 287 const AtomicString& MediaControlRootElementChromium::shadowPseudoId() const |
| 288 { | 288 { |
| 289 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls")); | 289 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls")); |
| 290 return id; | 290 return id; |
| 291 } | 291 } |
| 292 | 292 |
| 293 void MediaControlRootElementChromium::bufferingProgressed() |
| 294 { |
| 295 // We only need to update buffering progress when paused, during normal |
| 296 // playback playbackProgressed() will take care of it. |
| 297 if (m_mediaElement->paused()) |
| 298 m_timeline->setPosition(m_mediaElement->currentTime()); |
| 299 } |
| 300 |
| 293 } | 301 } |
| 294 | 302 |
| 295 #endif | 303 #endif |
| OLD | NEW |