| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2011, 2012 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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 if (now > 0) { | 282 if (now > 0) { |
| 283 m_currentTimeDisplay->show(); | 283 m_currentTimeDisplay->show(); |
| 284 m_durationDisplay->hide(); | 284 m_durationDisplay->hide(); |
| 285 } | 285 } |
| 286 | 286 |
| 287 // Allow the theme to format the time. | 287 // Allow the theme to format the time. |
| 288 m_currentTimeDisplay->setInnerText(RenderTheme::theme().formatMediaControlsC
urrentTime(now, duration), IGNORE_EXCEPTION); | 288 m_currentTimeDisplay->setInnerText(RenderTheme::theme().formatMediaControlsC
urrentTime(now, duration), IGNORE_EXCEPTION); |
| 289 m_currentTimeDisplay->setCurrentValue(now); | 289 m_currentTimeDisplay->setCurrentValue(now); |
| 290 } | 290 } |
| 291 | 291 |
| 292 void MediaControls::showVolumeSlider() | |
| 293 { | |
| 294 if (!m_mediaController->hasAudio()) | |
| 295 return; | |
| 296 | |
| 297 m_volumeSlider->show(); | |
| 298 } | |
| 299 | |
| 300 void MediaControls::changedMute() | 292 void MediaControls::changedMute() |
| 301 { | 293 { |
| 302 m_panelMuteButton->changedMute(); | 294 m_panelMuteButton->changedMute(); |
| 303 | 295 |
| 304 if (m_mediaController->muted()) | 296 if (m_mediaController->muted()) |
| 305 m_volumeSlider->setVolume(0); | 297 m_volumeSlider->setVolume(0); |
| 306 else | 298 else |
| 307 m_volumeSlider->setVolume(m_mediaController->volume()); | 299 m_volumeSlider->setVolume(m_mediaController->volume()); |
| 308 } | 300 } |
| 309 | 301 |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 464 m_textDisplayContainer->updateDisplay(); | 456 m_textDisplayContainer->updateDisplay(); |
| 465 } | 457 } |
| 466 | 458 |
| 467 void MediaControls::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackCon
tainerElement> textTrackContainer) | 459 void MediaControls::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackCon
tainerElement> textTrackContainer) |
| 468 { | 460 { |
| 469 // Insert it before the first controller element so it always displays behin
d the controls. | 461 // Insert it before the first controller element so it always displays behin
d the controls. |
| 470 insertBefore(textTrackContainer, m_enclosure); | 462 insertBefore(textTrackContainer, m_enclosure); |
| 471 } | 463 } |
| 472 | 464 |
| 473 } | 465 } |
| OLD | NEW |