| 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 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 365 return; | 365 return; |
| 366 | 366 |
| 367 makeTransparent(); | 367 makeTransparent(); |
| 368 } | 368 } |
| 369 | 369 |
| 370 void MediaControls::startHideFullscreenControlsTimer() | 370 void MediaControls::startHideFullscreenControlsTimer() |
| 371 { | 371 { |
| 372 if (!m_isFullscreen) | 372 if (!m_isFullscreen) |
| 373 return; | 373 return; |
| 374 | 374 |
| 375 m_hideFullscreenControlsTimer.startOneShot(timeWithoutMouseMovementBeforeHid
ingFullscreenControls); | 375 m_hideFullscreenControlsTimer.startOneShot(timeWithoutMouseMovementBeforeHid
ingFullscreenControls, FROM_HERE); |
| 376 } | 376 } |
| 377 | 377 |
| 378 void MediaControls::stopHideFullscreenControlsTimer() | 378 void MediaControls::stopHideFullscreenControlsTimer() |
| 379 { | 379 { |
| 380 m_hideFullscreenControlsTimer.stop(); | 380 m_hideFullscreenControlsTimer.stop(); |
| 381 } | 381 } |
| 382 | 382 |
| 383 const AtomicString& MediaControls::shadowPseudoId() const | 383 const AtomicString& MediaControls::shadowPseudoId() const |
| 384 { | 384 { |
| 385 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls")); | 385 DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls")); |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 431 m_textDisplayContainer->updateDisplay(); | 431 m_textDisplayContainer->updateDisplay(); |
| 432 } | 432 } |
| 433 | 433 |
| 434 void MediaControls::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackCon
tainerElement> textTrackContainer) | 434 void MediaControls::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackCon
tainerElement> textTrackContainer) |
| 435 { | 435 { |
| 436 // Insert it before the first controller element so it always displays behin
d the controls. | 436 // Insert it before the first controller element so it always displays behin
d the controls. |
| 437 insertBefore(textTrackContainer, m_enclosure); | 437 insertBefore(textTrackContainer, m_enclosure); |
| 438 } | 438 } |
| 439 | 439 |
| 440 } | 440 } |
| OLD | NEW |