| 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 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 } | 326 } |
| 327 | 327 |
| 328 // Allow the theme to format the time. | 328 // Allow the theme to format the time. |
| 329 m_currentTimeDisplay->setInnerText(LayoutTheme::theme().formatMediaControlsC
urrentTime(now, duration), IGNORE_EXCEPTION); | 329 m_currentTimeDisplay->setInnerText(LayoutTheme::theme().formatMediaControlsC
urrentTime(now, duration), IGNORE_EXCEPTION); |
| 330 m_currentTimeDisplay->setCurrentValue(now); | 330 m_currentTimeDisplay->setCurrentValue(now); |
| 331 } | 331 } |
| 332 | 332 |
| 333 void MediaControls::updateVolume() | 333 void MediaControls::updateVolume() |
| 334 { | 334 { |
| 335 m_muteButton->updateDisplayType(); | 335 m_muteButton->updateDisplayType(); |
| 336 if (m_muteButton->renderer()) | 336 if (m_muteButton->layoutObject()) |
| 337 m_muteButton->renderer()->setShouldDoFullPaintInvalidation(); | 337 m_muteButton->layoutObject()->setShouldDoFullPaintInvalidation(); |
| 338 | 338 |
| 339 if (mediaElement().muted()) | 339 if (mediaElement().muted()) |
| 340 m_volumeSlider->setVolume(0); | 340 m_volumeSlider->setVolume(0); |
| 341 else | 341 else |
| 342 m_volumeSlider->setVolume(mediaElement().volume()); | 342 m_volumeSlider->setVolume(mediaElement().volume()); |
| 343 } | 343 } |
| 344 | 344 |
| 345 void MediaControls::changedClosedCaptionsVisibility() | 345 void MediaControls::changedClosedCaptionsVisibility() |
| 346 { | 346 { |
| 347 m_toggleClosedCaptionsButton->updateDisplayType(); | 347 m_toggleClosedCaptionsButton->updateDisplayType(); |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 551 visitor->trace(m_toggleClosedCaptionsButton); | 551 visitor->trace(m_toggleClosedCaptionsButton); |
| 552 visitor->trace(m_fullScreenButton); | 552 visitor->trace(m_fullScreenButton); |
| 553 visitor->trace(m_durationDisplay); | 553 visitor->trace(m_durationDisplay); |
| 554 visitor->trace(m_enclosure); | 554 visitor->trace(m_enclosure); |
| 555 visitor->trace(m_castButton); | 555 visitor->trace(m_castButton); |
| 556 visitor->trace(m_overlayCastButton); | 556 visitor->trace(m_overlayCastButton); |
| 557 HTMLDivElement::trace(visitor); | 557 HTMLDivElement::trace(visitor); |
| 558 } | 558 } |
| 559 | 559 |
| 560 } | 560 } |
| OLD | NEW |