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

Side by Side Diff: Source/web/WebMediaPlayerClientImpl.cpp

Issue 946503003: Add HTMLMediaElement.waitingforkey event (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "web/WebMediaPlayerClientImpl.h" 6 #include "web/WebMediaPlayerClientImpl.h"
7 7
8 #include "core/frame/LocalFrame.h" 8 #include "core/frame/LocalFrame.h"
9 #include "core/html/HTMLMediaElement.h" 9 #include "core/html/HTMLMediaElement.h"
10 #include "core/html/TimeRanges.h" 10 #include "core/html/TimeRanges.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 void WebMediaPlayerClientImpl::keyMessage(const WebString& keySystem, const WebS tring& sessionId, const unsigned char* message, unsigned messageLength, const We bURL& defaultURL) 121 void WebMediaPlayerClientImpl::keyMessage(const WebString& keySystem, const WebS tring& sessionId, const unsigned char* message, unsigned messageLength, const We bURL& defaultURL)
122 { 122 {
123 HTMLMediaElementEncryptedMedia::keyMessage(mediaElement(), keySystem, sessio nId, message, messageLength, defaultURL); 123 HTMLMediaElementEncryptedMedia::keyMessage(mediaElement(), keySystem, sessio nId, message, messageLength, defaultURL);
124 } 124 }
125 125
126 void WebMediaPlayerClientImpl::encrypted(const WebString& initDataType, const un signed char* initData, unsigned initDataLength) 126 void WebMediaPlayerClientImpl::encrypted(const WebString& initDataType, const un signed char* initData, unsigned initDataLength)
127 { 127 {
128 HTMLMediaElementEncryptedMedia::encrypted(mediaElement(), initDataType, init Data, initDataLength); 128 HTMLMediaElementEncryptedMedia::encrypted(mediaElement(), initDataType, init Data, initDataLength);
129 } 129 }
130 130
131 void WebMediaPlayerClientImpl::waitingForKey()
132 {
133 HTMLMediaElementEncryptedMedia::waitingForKey(mediaElement());
134 }
135
136 void WebMediaPlayerClientImpl::playbackResumedAfterKey()
137 {
138 HTMLMediaElementEncryptedMedia::playbackResumedAfterKey(mediaElement());
139 }
140
131 void WebMediaPlayerClientImpl::setWebLayer(WebLayer* layer) 141 void WebMediaPlayerClientImpl::setWebLayer(WebLayer* layer)
132 { 142 {
133 m_client->mediaPlayerSetWebLayer(layer); 143 m_client->mediaPlayerSetWebLayer(layer);
134 } 144 }
135 145
136 WebMediaPlayer::TrackId WebMediaPlayerClientImpl::addAudioTrack(const WebString& id, AudioTrackKind kind, const WebString& label, const WebString& language, boo l enabled) 146 WebMediaPlayer::TrackId WebMediaPlayerClientImpl::addAudioTrack(const WebString& id, AudioTrackKind kind, const WebString& label, const WebString& language, boo l enabled)
137 { 147 {
138 return mediaElement().addAudioTrack(id, kind, label, language, enabled); 148 return mediaElement().addAudioTrack(id, kind, label, language, enabled);
139 } 149 }
140 150
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 } 319 }
310 320
311 void WebMediaPlayerClientImpl::AudioClientImpl::trace(Visitor* visitor) 321 void WebMediaPlayerClientImpl::AudioClientImpl::trace(Visitor* visitor)
312 { 322 {
313 visitor->trace(m_client); 323 visitor->trace(m_client);
314 } 324 }
315 325
316 #endif 326 #endif
317 327
318 } // namespace blink 328 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698