Fire canplaythrough event at the proper time for audio/video

webkit/media/webmediaplayer_proxy.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/webmediaplayer_proxy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "media/base/pipeline_status.h"
 #include "media/filters/chunk_demuxer.h"
 #include "webkit/media/web_video_renderer.h"
 #include "webkit/media/webmediaplayer_impl.h"
 
+using media::NetworkEvent;
 using media::PipelineStatus;
 
 namespace webkit_media {
 
 // Limits the maximum outstanding repaints posted on render thread.
 // This number of 50 is a guess, it does not take too much memory on the task
 // queue but gives up a pretty good latency on repaint.
 static const int kMaxOutstandingRepaints = 50;
 
 WebMediaPlayerProxy::WebMediaPlayerProxy(MessageLoop* render_loop,
@@ skipping 95 matching lines @@
   render_loop_->PostTask(FROM_HERE, NewRunnableMethod(
       this, &WebMediaPlayerProxy::PipelineEndedTask, status));
 }
 
 void WebMediaPlayerProxy::PipelineErrorCallback(PipelineStatus error) {
   DCHECK_NE(error, media::PIPELINE_OK);
   render_loop_->PostTask(FROM_HERE, NewRunnableMethod(
       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) {
   base::AutoLock auto_lock(data_sources_lock_);
   data_sources_.push_back(make_scoped_refptr(data_source));
 }
 
 void WebMediaPlayerProxy::RepaintTask() {
   DCHECK(MessageLoop::current() == render_loop_);
   {
@@ skipping 23 matching lines @@
   if (webmediaplayer_)
     webmediaplayer_->OnPipelineEnded(status);
 }
 
 void WebMediaPlayerProxy::PipelineErrorTask(PipelineStatus error) {
   DCHECK(MessageLoop::current() == render_loop_);
   if (webmediaplayer_)
     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(
     scoped_refptr<media::VideoFrame>* frame_out) {
   if (video_renderer_)
     video_renderer_->GetCurrentFrame(frame_out);
 }
 
 void WebMediaPlayerProxy::PutCurrentFrame(
     scoped_refptr<media::VideoFrame> frame) {
@@ skipping 39 matching lines @@
   chunk_demuxer_ = demuxer;
   if (webmediaplayer_)
     webmediaplayer_->OnDemuxerOpened();
 }
 
 void WebMediaPlayerProxy::DemuxerClosedTask() {
   chunk_demuxer_ = NULL;
 }
 
 }  // namespace webkit_media