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

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

Issue 616953003: Remove keyNeeded() now that encrypted() exists. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@onencrypted
Patch Set: Add WebMediaPlayerClientImpl.cpp. Created 6 years, 2 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
« no previous file with comments | « Source/web/WebMediaPlayerClientImpl.h ('k') | public/platform/WebMediaPlayerClient.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 void WebMediaPlayerClientImpl::keyError(const WebString& keySystem, const WebStr ing& sessionId, MediaKeyErrorCode errorCode, unsigned short systemCode) 116 void WebMediaPlayerClientImpl::keyError(const WebString& keySystem, const WebStr ing& sessionId, MediaKeyErrorCode errorCode, unsigned short systemCode)
117 { 117 {
118 HTMLMediaElementEncryptedMedia::keyError(mediaElement(), keySystem, sessionI d, errorCode, systemCode); 118 HTMLMediaElementEncryptedMedia::keyError(mediaElement(), keySystem, sessionI d, errorCode, systemCode);
119 } 119 }
120 120
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::keyNeeded(const WebString& contentType, const uns igned char* initData, unsigned initDataLength)
127 {
128 HTMLMediaElementEncryptedMedia::encrypted(mediaElement(), contentType, initD ata, initDataLength);
129 }
130
131 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)
132 { 127 {
133 HTMLMediaElementEncryptedMedia::encrypted(mediaElement(), initDataType, init Data, initDataLength); 128 HTMLMediaElementEncryptedMedia::encrypted(mediaElement(), initDataType, init Data, initDataLength);
134 } 129 }
135 130
136 void WebMediaPlayerClientImpl::setWebLayer(WebLayer* layer) 131 void WebMediaPlayerClientImpl::setWebLayer(WebLayer* layer)
137 { 132 {
138 m_client->mediaPlayerSetWebLayer(layer); 133 m_client->mediaPlayerSetWebLayer(layer);
139 } 134 }
140 135
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 } 304 }
310 305
311 void WebMediaPlayerClientImpl::AudioClientImpl::trace(Visitor* visitor) 306 void WebMediaPlayerClientImpl::AudioClientImpl::trace(Visitor* visitor)
312 { 307 {
313 visitor->trace(m_client); 308 visitor->trace(m_client);
314 } 309 }
315 310
316 #endif 311 #endif
317 312
318 } // namespace blink 313 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebMediaPlayerClientImpl.h ('k') | public/platform/WebMediaPlayerClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698