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

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

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

Powered by Google App Engine
This is Rietveld 408576698