| Index: webkit/media/webmediaplayer_proxy.cc
|
| diff --git a/webkit/media/webmediaplayer_proxy.cc b/webkit/media/webmediaplayer_proxy.cc
|
| index a596ed8faec274814f72830acd6ddede38a715be..895a55b65123cb4d1df60a2f8edbdeae02f030b5 100644
|
| --- a/webkit/media/webmediaplayer_proxy.cc
|
| +++ b/webkit/media/webmediaplayer_proxy.cc
|
| @@ -12,6 +12,7 @@
|
| #include "webkit/media/web_video_renderer.h"
|
| #include "webkit/media/webmediaplayer_impl.h"
|
|
|
| +using media::NetworkEvent;
|
| using media::PipelineStatus;
|
|
|
| namespace webkit_media {
|
| @@ -127,9 +128,9 @@ void WebMediaPlayerProxy::PipelineErrorCallback(PipelineStatus error) {
|
| this, &WebMediaPlayerProxy::PipelineErrorTask, error));
|
| }
|
|
|
| -void WebMediaPlayerProxy::NetworkEventCallback(bool is_downloading_data) {
|
| +void WebMediaPlayerProxy::NetworkEventCallback(NetworkEvent type) {
|
| render_loop_->PostTask(FROM_HERE, NewRunnableMethod(
|
| - this, &WebMediaPlayerProxy::NetworkEventTask, is_downloading_data));
|
| + this, &WebMediaPlayerProxy::NetworkEventTask, type));
|
| }
|
|
|
| void WebMediaPlayerProxy::AddDataSource(WebDataSource* data_source) {
|
| @@ -173,10 +174,10 @@ void WebMediaPlayerProxy::PipelineErrorTask(PipelineStatus error) {
|
| webmediaplayer_->OnPipelineError(error);
|
| }
|
|
|
| -void WebMediaPlayerProxy::NetworkEventTask(bool is_downloading_data) {
|
| +void WebMediaPlayerProxy::NetworkEventTask(NetworkEvent type) {
|
| DCHECK(MessageLoop::current() == render_loop_);
|
| if (webmediaplayer_)
|
| - webmediaplayer_->OnNetworkEvent(is_downloading_data);
|
| + webmediaplayer_->OnNetworkEvent(type);
|
| }
|
|
|
| void WebMediaPlayerProxy::GetCurrentFrame(
|
|
|