OLD | NEW |
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 "WebMediaPlayerClientImpl.h" | 6 #include "WebMediaPlayerClientImpl.h" |
7 | 7 |
8 #include "WebDocument.h" | 8 #include "WebDocument.h" |
9 #include "WebFrameClient.h" | 9 #include "WebFrameClient.h" |
10 #include "WebFrameImpl.h" | 10 #include "WebFrameImpl.h" |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 m_client->mediaPlayerKeyError(keySystem, sessionId, static_cast<MediaPlayerC
lient::MediaKeyErrorCode>(errorCode), systemCode); | 135 m_client->mediaPlayerKeyError(keySystem, sessionId, static_cast<MediaPlayerC
lient::MediaKeyErrorCode>(errorCode), systemCode); |
136 } | 136 } |
137 | 137 |
138 void WebMediaPlayerClientImpl::keyMessage(const WebString& keySystem, const WebS
tring& sessionId, const unsigned char* message, unsigned messageLength, const We
bURL& defaultURL) | 138 void WebMediaPlayerClientImpl::keyMessage(const WebString& keySystem, const WebS
tring& sessionId, const unsigned char* message, unsigned messageLength, const We
bURL& defaultURL) |
139 { | 139 { |
140 m_client->mediaPlayerKeyMessage(keySystem, sessionId, message, messageLength
, defaultURL); | 140 m_client->mediaPlayerKeyMessage(keySystem, sessionId, message, messageLength
, defaultURL); |
141 } | 141 } |
142 | 142 |
143 void WebMediaPlayerClientImpl::keyNeeded(const WebString& keySystem, const WebSt
ring& sessionId, const unsigned char* initData, unsigned initDataLength) | 143 void WebMediaPlayerClientImpl::keyNeeded(const WebString& keySystem, const WebSt
ring& sessionId, const unsigned char* initData, unsigned initDataLength) |
144 { | 144 { |
145 m_client->mediaPlayerKeyNeeded(keySystem, sessionId, initData, initDataLengt
h); | 145 // FIXME: remove after callers change to pass contentType. |
| 146 m_client->mediaPlayerKeyNeeded(WebString(), initData, initDataLength); |
| 147 } |
| 148 |
| 149 void WebMediaPlayerClientImpl::keyNeeded(const WebString& contentType, const uns
igned char* initData, unsigned initDataLength) |
| 150 { |
| 151 m_client->mediaPlayerKeyNeeded(contentType, initData, initDataLength); |
146 } | 152 } |
147 | 153 |
148 WebPlugin* WebMediaPlayerClientImpl::createHelperPlugin(const WebString& pluginT
ype, WebFrame* frame) | 154 WebPlugin* WebMediaPlayerClientImpl::createHelperPlugin(const WebString& pluginT
ype, WebFrame* frame) |
149 { | 155 { |
150 ASSERT(!m_helperPlugin); | 156 ASSERT(!m_helperPlugin); |
151 | 157 |
152 m_helperPlugin = toWebViewImpl(frame->view())->createHelperPlugin(pluginType
, frame->document()); | 158 m_helperPlugin = toWebViewImpl(frame->view())->createHelperPlugin(pluginType
, frame->document()); |
153 if (!m_helperPlugin) | 159 if (!m_helperPlugin) |
154 return 0; | 160 return 0; |
155 | 161 |
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
670 | 676 |
671 void WebMediaPlayerClientImpl::AudioClientImpl::setFormat(size_t numberOfChannel
s, float sampleRate) | 677 void WebMediaPlayerClientImpl::AudioClientImpl::setFormat(size_t numberOfChannel
s, float sampleRate) |
672 { | 678 { |
673 if (m_client) | 679 if (m_client) |
674 m_client->setFormat(numberOfChannels, sampleRate); | 680 m_client->setFormat(numberOfChannels, sampleRate); |
675 } | 681 } |
676 | 682 |
677 #endif | 683 #endif |
678 | 684 |
679 } // namespace blink | 685 } // namespace blink |
OLD | NEW |