| 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 27 matching lines...) Expand all Loading... |
| 38 , m_mediaController(0) | 38 , m_mediaController(0) |
| 39 , m_panel(0) | 39 , m_panel(0) |
| 40 , m_textDisplayContainer(0) | 40 , m_textDisplayContainer(0) |
| 41 , m_playButton(0) | 41 , m_playButton(0) |
| 42 , m_currentTimeDisplay(0) | 42 , m_currentTimeDisplay(0) |
| 43 , m_timeline(0) | 43 , m_timeline(0) |
| 44 , m_panelMuteButton(0) | 44 , m_panelMuteButton(0) |
| 45 , m_volumeSlider(0) | 45 , m_volumeSlider(0) |
| 46 , m_toggleClosedCaptionsButton(0) | 46 , m_toggleClosedCaptionsButton(0) |
| 47 , m_fullScreenButton(0) | 47 , m_fullScreenButton(0) |
| 48 , m_durationDisplay(0) |
| 49 , m_enclosure(0) |
| 48 , m_hideFullscreenControlsTimer(this, &MediaControls::hideFullscreenControls
TimerFired) | 50 , m_hideFullscreenControlsTimer(this, &MediaControls::hideFullscreenControls
TimerFired) |
| 49 , m_isFullscreen(false) | 51 , m_isFullscreen(false) |
| 50 , m_isMouseOverControls(false) | 52 , m_isMouseOverControls(false) |
| 51 , m_durationDisplay(0) | |
| 52 , m_enclosure(0) | |
| 53 { | 53 { |
| 54 } | 54 } |
| 55 | 55 |
| 56 // MediaControls::create() for Android is defined in MediaControlsAndroid.cpp. | 56 // MediaControls::create() for Android is defined in MediaControlsAndroid.cpp. |
| 57 #if !OS(ANDROID) | 57 #if !OS(ANDROID) |
| 58 PassRefPtr<MediaControls> MediaControls::create(Document& document) | 58 PassRefPtr<MediaControls> MediaControls::create(Document& document) |
| 59 { | 59 { |
| 60 if (!document.page()) | 60 if (!document.page()) |
| 61 return 0; | 61 return 0; |
| 62 | 62 |
| (...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 m_textDisplayContainer->updateDisplay(); | 480 m_textDisplayContainer->updateDisplay(); |
| 481 } | 481 } |
| 482 | 482 |
| 483 void MediaControls::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackCon
tainerElement> textTrackContainer) | 483 void MediaControls::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackCon
tainerElement> textTrackContainer) |
| 484 { | 484 { |
| 485 // Insert it before the first controller element so it always displays behin
d the controls. | 485 // Insert it before the first controller element so it always displays behin
d the controls. |
| 486 insertBefore(textTrackContainer, m_enclosure); | 486 insertBefore(textTrackContainer, m_enclosure); |
| 487 } | 487 } |
| 488 | 488 |
| 489 } | 489 } |
| OLD | NEW |