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