| 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 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 390 | 390 |
| 391 void MediaControls::startHideFullscreenControlsTimer() | 391 void MediaControls::startHideFullscreenControlsTimer() |
| 392 { | 392 { |
| 393 if (!m_isFullscreen) | 393 if (!m_isFullscreen) |
| 394 return; | 394 return; |
| 395 | 395 |
| 396 Page* page = document().page(); | 396 Page* page = document().page(); |
| 397 if (!page) | 397 if (!page) |
| 398 return; | 398 return; |
| 399 | 399 |
| 400 m_hideFullscreenControlsTimer.startOneShot(timeWithoutMouseMovementBeforeHid
ingFullscreenControls); | 400 m_hideFullscreenControlsTimer.startOneShot(timeWithoutMouseMovementBeforeHid
ingFullscreenControls, FROM_HERE); |
| 401 } | 401 } |
| 402 | 402 |
| 403 void MediaControls::stopHideFullscreenControlsTimer() | 403 void MediaControls::stopHideFullscreenControlsTimer() |
| 404 { | 404 { |
| 405 m_hideFullscreenControlsTimer.stop(); | 405 m_hideFullscreenControlsTimer.stop(); |
| 406 } | 406 } |
| 407 | 407 |
| 408 const AtomicString& MediaControls::shadowPseudoId() const | 408 const AtomicString& MediaControls::shadowPseudoId() const |
| 409 { | 409 { |
| 410 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls")); | 410 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls")); |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 456 m_textDisplayContainer->updateDisplay(); | 456 m_textDisplayContainer->updateDisplay(); |
| 457 } | 457 } |
| 458 | 458 |
| 459 void MediaControls::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackCon
tainerElement> textTrackContainer) | 459 void MediaControls::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackCon
tainerElement> textTrackContainer) |
| 460 { | 460 { |
| 461 // 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. |
| 462 insertBefore(textTrackContainer, m_enclosure); | 462 insertBefore(textTrackContainer, m_enclosure); |
| 463 } | 463 } |
| 464 | 464 |
| 465 } | 465 } |
| OLD | NEW |