| 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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 if (m_textDisplayContainer) | 352 if (m_textDisplayContainer) |
| 353 return; | 353 return; |
| 354 | 354 |
| 355 RefPtr<MediaControlTextTrackContainerElement> textDisplayContainer = MediaCo
ntrolTextTrackContainerElement::create(document()); | 355 RefPtr<MediaControlTextTrackContainerElement> textDisplayContainer = MediaCo
ntrolTextTrackContainerElement::create(document()); |
| 356 m_textDisplayContainer = textDisplayContainer.get(); | 356 m_textDisplayContainer = textDisplayContainer.get(); |
| 357 | 357 |
| 358 if (m_mediaController) | 358 if (m_mediaController) |
| 359 m_textDisplayContainer->setMediaController(m_mediaController); | 359 m_textDisplayContainer->setMediaController(m_mediaController); |
| 360 | 360 |
| 361 // Insert it before the first controller element so it always displays behin
d the controls. | 361 // Insert it before the first controller element so it always displays behin
d the controls. |
| 362 insertBefore(textDisplayContainer.release(), m_panel, IGNORE_EXCEPTION_STATE
, AttachLazily); | 362 insertBefore(textDisplayContainer.release(), m_panel, IGNORE_EXCEPTION, Atta
chLazily); |
| 363 } | 363 } |
| 364 | 364 |
| 365 void MediaControls::showTextTrackDisplay() | 365 void MediaControls::showTextTrackDisplay() |
| 366 { | 366 { |
| 367 if (!m_textDisplayContainer) | 367 if (!m_textDisplayContainer) |
| 368 createTextTrackDisplay(); | 368 createTextTrackDisplay(); |
| 369 m_textDisplayContainer->show(); | 369 m_textDisplayContainer->show(); |
| 370 } | 370 } |
| 371 | 371 |
| 372 void MediaControls::hideTextTrackDisplay() | 372 void MediaControls::hideTextTrackDisplay() |
| 373 { | 373 { |
| 374 if (!m_textDisplayContainer) | 374 if (!m_textDisplayContainer) |
| 375 createTextTrackDisplay(); | 375 createTextTrackDisplay(); |
| 376 m_textDisplayContainer->hide(); | 376 m_textDisplayContainer->hide(); |
| 377 } | 377 } |
| 378 | 378 |
| 379 void MediaControls::updateTextTrackDisplay() | 379 void MediaControls::updateTextTrackDisplay() |
| 380 { | 380 { |
| 381 if (!m_textDisplayContainer) | 381 if (!m_textDisplayContainer) |
| 382 createTextTrackDisplay(); | 382 createTextTrackDisplay(); |
| 383 | 383 |
| 384 m_textDisplayContainer->updateDisplay(); | 384 m_textDisplayContainer->updateDisplay(); |
| 385 } | 385 } |
| 386 | 386 |
| 387 } | 387 } |
| OLD | NEW |