Chromium Code Reviews| Index: content/renderer/media/webmediaplayer_impl.cc |
| diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc |
| index 411b814757cd4c0f737f2fb995bd249ecee8962f..6c0f45ef8d6ba753902fe59aaa43f9c2db34abf3 100644 |
| --- a/content/renderer/media/webmediaplayer_impl.cc |
| +++ b/content/renderer/media/webmediaplayer_impl.cc |
| @@ -1062,17 +1062,24 @@ void WebMediaPlayerImpl::OnAddTextTrack( |
| void WebMediaPlayerImpl::OnKeyError(const std::string& session_id, |
| media::MediaKeys::KeyError error_code, |
| - int system_code) { |
| + uint32 system_code) { |
| DCHECK(main_loop_->BelongsToCurrentThread()); |
| EmeUMAHistogramEnumeration(current_key_system_, "KeyError", |
| error_code, media::MediaKeys::kMaxKeyError); |
| + unsigned short short_system_code = 0; |
| + if (system_code > std::numeric_limits<unsigned short>::max()) { |
| + LOG(WARNING) << "system_code exceeds unsigned short limit."; |
|
ddorwin
2014/03/01 06:18:09
ditto
xhwang
2014/03/03 19:06:36
Done.
|
| + } else { |
| + short_system_code = static_cast<unsigned short>(system_code); |
| + } |
| + |
| client_->keyError( |
| WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)), |
| WebString::fromUTF8(session_id), |
| static_cast<blink::WebMediaPlayerClient::MediaKeyErrorCode>(error_code), |
| - system_code); |
| + short_system_code); |
| } |
| void WebMediaPlayerImpl::OnKeyMessage(const std::string& session_id, |