Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(303)

Side by Side Diff: Source/core/html/shadow/MediaControlsAndroid.cpp

Issue 157423002: Rename MediaControlsChromiumAndroid to MediaControlsAndroid (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/html/shadow/MediaControlsChromiumAndroid.h" 27 #include "core/html/shadow/MediaControlsAndroid.h"
28 28
29 #include "bindings/v8/ExceptionState.h" 29 #include "bindings/v8/ExceptionState.h"
30 #include "bindings/v8/ExceptionStatePlaceholder.h" 30 #include "bindings/v8/ExceptionStatePlaceholder.h"
31 31
32 namespace WebCore { 32 namespace WebCore {
33 33
34 MediaControlsChromiumAndroid::MediaControlsChromiumAndroid(Document& document) 34 MediaControlsAndroid::MediaControlsAndroid(Document& document)
35 : MediaControls(document) 35 : MediaControls(document)
36 , m_overlayPlayButton(0) 36 , m_overlayPlayButton(0)
37 , m_overlayEnclosure(0) 37 , m_overlayEnclosure(0)
38 { 38 {
39 } 39 }
40 40
41 bool MediaControlsChromiumAndroid::initializeControls(Document& document) 41 bool MediaControlsAndroid::initializeControls(Document& document)
42 { 42 {
43 TrackExceptionState exceptionState; 43 TrackExceptionState exceptionState;
44 44
45 RefPtr<MediaControlOverlayEnclosureElement> overlayEnclosure = MediaControlO verlayEnclosureElement::create(document); 45 RefPtr<MediaControlOverlayEnclosureElement> overlayEnclosure = MediaControlO verlayEnclosureElement::create(document);
46 RefPtr<MediaControlOverlayPlayButtonElement> overlayPlayButton = MediaContro lOverlayPlayButtonElement::create(document); 46 RefPtr<MediaControlOverlayPlayButtonElement> overlayPlayButton = MediaContro lOverlayPlayButtonElement::create(document);
47 m_overlayPlayButton = overlayPlayButton.get(); 47 m_overlayPlayButton = overlayPlayButton.get();
48 overlayEnclosure->appendChild(overlayPlayButton.release(), exceptionState); 48 overlayEnclosure->appendChild(overlayPlayButton.release(), exceptionState);
49 if (exceptionState.hadException()) 49 if (exceptionState.hadException())
50 return false; 50 return false;
51 51
52 m_overlayEnclosure = overlayEnclosure.get(); 52 m_overlayEnclosure = overlayEnclosure.get();
53 appendChild(overlayEnclosure.release(), exceptionState); 53 appendChild(overlayEnclosure.release(), exceptionState);
54 if (exceptionState.hadException()) 54 if (exceptionState.hadException())
55 return false; 55 return false;
56 56
57 return MediaControls::initializeControls(document); 57 return MediaControls::initializeControls(document);
58 } 58 }
59 59
60 void MediaControlsChromiumAndroid::setMediaController(MediaControllerInterface* controller) 60 void MediaControlsAndroid::setMediaController(MediaControllerInterface* controll er)
61 { 61 {
62 if (m_overlayPlayButton) 62 if (m_overlayPlayButton)
63 m_overlayPlayButton->setMediaController(controller); 63 m_overlayPlayButton->setMediaController(controller);
64 if (m_overlayEnclosure) 64 if (m_overlayEnclosure)
65 m_overlayEnclosure->setMediaController(controller); 65 m_overlayEnclosure->setMediaController(controller);
66 MediaControls::setMediaController(controller); 66 MediaControls::setMediaController(controller);
67 } 67 }
68 68
69 void MediaControlsChromiumAndroid::playbackStarted() 69 void MediaControlsAndroid::playbackStarted()
70 { 70 {
71 m_overlayPlayButton->updateDisplayType(); 71 m_overlayPlayButton->updateDisplayType();
72 MediaControls::playbackStarted(); 72 MediaControls::playbackStarted();
73 } 73 }
74 74
75 void MediaControlsChromiumAndroid::playbackStopped() 75 void MediaControlsAndroid::playbackStopped()
76 { 76 {
77 m_overlayPlayButton->updateDisplayType(); 77 m_overlayPlayButton->updateDisplayType();
78 MediaControls::playbackStopped(); 78 MediaControls::playbackStopped();
79 } 79 }
80 80
81 void MediaControlsChromiumAndroid::insertTextTrackContainer(PassRefPtr<MediaCont rolTextTrackContainerElement> textTrackContainer) 81 void MediaControlsAndroid::insertTextTrackContainer(PassRefPtr<MediaControlTextT rackContainerElement> textTrackContainer)
82 { 82 {
83 // Insert it before the overlay play button so it always displays behind it. 83 // Insert it before the overlay play button so it always displays behind it.
84 m_overlayEnclosure->insertBefore(textTrackContainer, m_overlayPlayButton); 84 m_overlayEnclosure->insertBefore(textTrackContainer, m_overlayPlayButton);
85 } 85 }
86 } 86 }
OLDNEW
« no previous file with comments | « Source/core/html/shadow/MediaControlsAndroid.h ('k') | Source/core/html/shadow/MediaControlsChromiumAndroid.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698