Chromium Code Reviews| Index: content/renderer/media/android/webmediaplayer_android.cc |
| diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc |
| index f8eea96504bf4453bd55891ac09988d01dcd8b95..13f4fb7203f72bcc803bdc3e0bd9610c10455ebb 100644 |
| --- a/content/renderer/media/android/webmediaplayer_android.cc |
| +++ b/content/renderer/media/android/webmediaplayer_android.cc |
| @@ -1131,8 +1131,7 @@ void WebMediaPlayerAndroid::OnMediaSourceOpened( |
| void WebMediaPlayerAndroid::OnNeedKey(const std::string& session_id, |
| const std::string& type, |
| - scoped_ptr<uint8[]> init_data, |
| - int init_data_size) { |
| + const std::vector<uint8>& init_data) { |
| // Do not fire NeedKey event if encrypted media is not enabled. |
| if (!WebKit::WebRuntimeFeatures::isEncryptedMediaEnabled() && |
| !WebKit::WebRuntimeFeatures::isLegacyEncryptedMediaEnabled()) { |
| @@ -1147,8 +1146,8 @@ void WebMediaPlayerAndroid::OnNeedKey(const std::string& session_id, |
| client_->keyNeeded(WebString(), |
| WebString::fromUTF8(session_id), |
| - init_data.get(), |
| - init_data_size); |
| + &init_data[0], |
|
xhwang
2013/08/23 17:24:37
Is it possible that init_data.empty()? It'll crash
acolwell GONE FROM CHROMIUM
2013/08/23 19:55:28
Done.
|
| + init_data.size()); |
| } |
| #if defined(GOOGLE_TV) |