OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "content/renderer/media/android/webmediaplayer_android.h" | 5 #include "content/renderer/media/android/webmediaplayer_android.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
(...skipping 1465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1476 | 1476 |
1477 client_->keyError( | 1477 client_->keyError( |
1478 WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)), | 1478 WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)), |
1479 WebString::fromUTF8(session_id), | 1479 WebString::fromUTF8(session_id), |
1480 static_cast<blink::WebMediaPlayerClient::MediaKeyErrorCode>(error_code), | 1480 static_cast<blink::WebMediaPlayerClient::MediaKeyErrorCode>(error_code), |
1481 short_system_code); | 1481 short_system_code); |
1482 } | 1482 } |
1483 | 1483 |
1484 void WebMediaPlayerAndroid::OnKeyMessage(const std::string& session_id, | 1484 void WebMediaPlayerAndroid::OnKeyMessage(const std::string& session_id, |
1485 const std::vector<uint8>& message, | 1485 const std::vector<uint8>& message, |
1486 const std::string& destination_url) { | 1486 const GURL& destination_url) { |
1487 const GURL destination_url_gurl(destination_url); | 1487 DCHECK(destination_url.is_empty() || destination_url.is_valid()); |
1488 DLOG_IF(WARNING, !destination_url.empty() && !destination_url_gurl.is_valid()) | |
1489 << "Invalid URL in destination_url: " << destination_url; | |
1490 | 1488 |
1491 client_->keyMessage( | 1489 client_->keyMessage( |
1492 WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)), | 1490 WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)), |
1493 WebString::fromUTF8(session_id), | 1491 WebString::fromUTF8(session_id), |
1494 message.empty() ? NULL : &message[0], | 1492 message.empty() ? NULL : &message[0], |
1495 message.size(), | 1493 message.size(), |
1496 destination_url_gurl); | 1494 destination_url); |
1497 } | 1495 } |
1498 | 1496 |
1499 void WebMediaPlayerAndroid::OnMediaSourceOpened( | 1497 void WebMediaPlayerAndroid::OnMediaSourceOpened( |
1500 blink::WebMediaSource* web_media_source) { | 1498 blink::WebMediaSource* web_media_source) { |
1501 client_->mediaSourceOpened(web_media_source); | 1499 client_->mediaSourceOpened(web_media_source); |
1502 } | 1500 } |
1503 | 1501 |
1504 void WebMediaPlayerAndroid::OnNeedKey(const std::string& type, | 1502 void WebMediaPlayerAndroid::OnNeedKey(const std::string& type, |
1505 const std::vector<uint8>& init_data) { | 1503 const std::vector<uint8>& init_data) { |
1506 DCHECK(main_thread_checker_.CalledOnValidThread()); | 1504 DCHECK(main_thread_checker_.CalledOnValidThread()); |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1565 | 1563 |
1566 void WebMediaPlayerAndroid::exitFullscreen() { | 1564 void WebMediaPlayerAndroid::exitFullscreen() { |
1567 player_manager_->ExitFullscreen(player_id_); | 1565 player_manager_->ExitFullscreen(player_id_); |
1568 } | 1566 } |
1569 | 1567 |
1570 bool WebMediaPlayerAndroid::canEnterFullscreen() const { | 1568 bool WebMediaPlayerAndroid::canEnterFullscreen() const { |
1571 return player_manager_->CanEnterFullscreen(frame_); | 1569 return player_manager_->CanEnterFullscreen(frame_); |
1572 } | 1570 } |
1573 | 1571 |
1574 } // namespace content | 1572 } // namespace content |
OLD | NEW |