| 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 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 | 380 |
| 381 void MediaControls::startHideFullscreenControlsTimer() | 381 void MediaControls::startHideFullscreenControlsTimer() |
| 382 { | 382 { |
| 383 if (!m_isFullscreen) | 383 if (!m_isFullscreen) |
| 384 return; | 384 return; |
| 385 | 385 |
| 386 Page* page = document().page(); | 386 Page* page = document().page(); |
| 387 if (!page) | 387 if (!page) |
| 388 return; | 388 return; |
| 389 | 389 |
| 390 m_hideFullscreenControlsTimer.startOneShot(timeWithoutMouseMovementBeforeHid
ingFullscreenControls); | 390 m_hideFullscreenControlsTimer.startOneShot(timeWithoutMouseMovementBeforeHid
ingFullscreenControls, FROM_HERE); |
| 391 } | 391 } |
| 392 | 392 |
| 393 void MediaControls::stopHideFullscreenControlsTimer() | 393 void MediaControls::stopHideFullscreenControlsTimer() |
| 394 { | 394 { |
| 395 m_hideFullscreenControlsTimer.stop(); | 395 m_hideFullscreenControlsTimer.stop(); |
| 396 } | 396 } |
| 397 | 397 |
| 398 const AtomicString& MediaControls::shadowPseudoId() const | 398 const AtomicString& MediaControls::shadowPseudoId() const |
| 399 { | 399 { |
| 400 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls")); | 400 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls")); |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 446 m_textDisplayContainer->updateDisplay(); | 446 m_textDisplayContainer->updateDisplay(); |
| 447 } | 447 } |
| 448 | 448 |
| 449 void MediaControls::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackCon
tainerElement> textTrackContainer) | 449 void MediaControls::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackCon
tainerElement> textTrackContainer) |
| 450 { | 450 { |
| 451 // Insert it before the first controller element so it always displays behin
d the controls. | 451 // Insert it before the first controller element so it always displays behin
d the controls. |
| 452 insertBefore(textTrackContainer, m_enclosure); | 452 insertBefore(textTrackContainer, m_enclosure); |
| 453 } | 453 } |
| 454 | 454 |
| 455 } | 455 } |
| OLD | NEW |