| 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 11 matching lines...) Expand all Loading... |
| 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 #include "core/html/shadow/MediaControls.h" | 28 #include "core/html/shadow/MediaControls.h" |
| 29 | 29 |
| 30 #include "bindings/v8/ExceptionStatePlaceholder.h" | 30 #include "bindings/v8/ExceptionStatePlaceholder.h" |
| 31 #if OS(ANDROID) | 31 #if OS(ANDROID) |
| 32 #include "core/html/shadow/MediaControlsChromiumAndroid.h" | 32 #include "core/html/shadow/MediaControlsAndroid.h" |
| 33 #endif | 33 #endif |
| 34 | 34 |
| 35 namespace WebCore { | 35 namespace WebCore { |
| 36 | 36 |
| 37 static const double timeWithoutMouseMovementBeforeHidingFullscreenControls = 3; | 37 static const double timeWithoutMouseMovementBeforeHidingFullscreenControls = 3; |
| 38 | 38 |
| 39 MediaControls::MediaControls(Document& document) | 39 MediaControls::MediaControls(Document& document) |
| 40 : HTMLDivElement(document) | 40 : HTMLDivElement(document) |
| 41 , m_mediaController(0) | 41 , m_mediaController(0) |
| 42 , m_panel(0) | 42 , m_panel(0) |
| (...skipping 13 matching lines...) Expand all Loading... |
| 56 { | 56 { |
| 57 } | 57 } |
| 58 | 58 |
| 59 PassRefPtr<MediaControls> MediaControls::create(Document& document) | 59 PassRefPtr<MediaControls> MediaControls::create(Document& document) |
| 60 { | 60 { |
| 61 if (!document.page()) | 61 if (!document.page()) |
| 62 return 0; | 62 return 0; |
| 63 | 63 |
| 64 RefPtr<MediaControls> controls; | 64 RefPtr<MediaControls> controls; |
| 65 #if OS(ANDROID) | 65 #if OS(ANDROID) |
| 66 controls = adoptRef(new MediaControlsChromiumAndroid(document)); | 66 controls = adoptRef(new MediaControlsAndroid(document)); |
| 67 #else | 67 #else |
| 68 controls = adoptRef(new MediaControls(document)); | 68 controls = adoptRef(new MediaControls(document)); |
| 69 #endif | 69 #endif |
| 70 | 70 |
| 71 if (controls->initializeControls(document)) | 71 if (controls->initializeControls(document)) |
| 72 return controls.release(); | 72 return controls.release(); |
| 73 | 73 |
| 74 return 0; | 74 return 0; |
| 75 } | 75 } |
| 76 | 76 |
| (...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 485 m_textDisplayContainer->updateDisplay(); | 485 m_textDisplayContainer->updateDisplay(); |
| 486 } | 486 } |
| 487 | 487 |
| 488 void MediaControls::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackCon
tainerElement> textTrackContainer) | 488 void MediaControls::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackCon
tainerElement> textTrackContainer) |
| 489 { | 489 { |
| 490 // Insert it before the first controller element so it always displays behin
d the controls. | 490 // Insert it before the first controller element so it always displays behin
d the controls. |
| 491 insertBefore(textTrackContainer, m_enclosure); | 491 insertBefore(textTrackContainer, m_enclosure); |
| 492 } | 492 } |
| 493 | 493 |
| 494 } | 494 } |
| OLD | NEW |