Add NetworkEventCB to media pipeline and remove IsNetworkActive()

Network events and the network status associated with the event (active or
in-) should be coupled together. WebMediaPlayerImpl should not ask the
PipelineImpl for network activity.

BUG=100652
TEST=none

Review URL: http://codereview.chromium.org/8342013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106369 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 44 insertions, 58 deletions

diff --git a/webkit/glue/media/buffered_data_source.cc b/webkit/glue/media/buffered_data_source.cc
index 407a73a..a3f43cf5 100644
--- a/webkit/glue/media/buffered_data_source.cc
+++ b/webkit/glue/media/buffered_data_source.cc
@@ -50,7 +50,7 @@ BufferedDataSource::BufferedDataSource(
       streaming_(false),
       frame_(frame),
       loader_(NULL),
-      network_activity_(false),
+      is_downloading_data_(false),
       read_position_(0),
       read_size_(0),
       read_buffer_(NULL),
@@ -621,7 +621,7 @@ void BufferedDataSource::NetworkEventCallback() {
   if (loaded_)
     return;
 
-  bool network_activity = loader_->network_activity();
+  bool is_downloading_data = loader_->is_downloading_data();
   int64 buffered_position = loader_->GetBufferedPosition();
 
   // If we get an unspecified value, return immediately.
@@ -640,10 +640,10 @@ void BufferedDataSource::NetworkEventCallback() {
   if (stop_signal_received_)
     return;
 
-  if (network_activity != network_activity_) {
-    network_activity_ = network_activity;
+  if (is_downloading_data != is_downloading_data_) {
+    is_downloading_data_ = is_downloading_data;
     if (host())
-      host()->SetNetworkActivity(network_activity);
+      host()->SetNetworkActivity(is_downloading_data);
   }
 
   buffered_bytes_ = buffered_position + 1;
diff --git a/webkit/glue/media/buffered_data_source.h b/webkit/glue/media/buffered_data_source.h
index b157d5e..7667e4c 100644
--- a/webkit/glue/media/buffered_data_source.h
+++ b/webkit/glue/media/buffered_data_source.h
@@ -158,8 +158,8 @@ class BufferedDataSource : public WebDataSource {
   // A resource loader for the media resource.
   scoped_refptr<BufferedResourceLoader> loader_;
 
-  // True if network is active.
-  bool network_activity_;
+  // True if |loader| is downloading data.
+  bool is_downloading_data_;
 
   // Callback method from the pipeline for initialization.
   media::PipelineStatusCB initialize_cb_;
diff --git a/webkit/glue/media/buffered_resource_loader.cc b/webkit/glue/media/buffered_resource_loader.cc
index d39d54b..457aee2 100644
--- a/webkit/glue/media/buffered_resource_loader.cc
+++ b/webkit/glue/media/buffered_resource_loader.cc
@@ -295,12 +295,8 @@ void BufferedResourceLoader::Read(int64 position,
     // Make sure we stop deferring now that there's additional capacity.
     //
     // XXX: can we DCHECK(url_loader_.get()) at this point in time?
-    if (deferred_ && url_loader_.get()) {
-      deferred_ = false;
-
-      url_loader_->setDefersLoading(deferred_);
-      NotifyNetworkEvent();
-    }
+    if (deferred_)
+      SetDeferred(false);
 
     DCHECK(!ShouldEnableDefer())
         << "Capacity was not adjusted properly to prevent deferring.";
@@ -330,7 +326,7 @@ bool BufferedResourceLoader::range_supported() {
   return range_supported_;
 }
 
-bool BufferedResourceLoader::network_activity() {
+bool BufferedResourceLoader::is_downloading_data() {
   return !completed_ && !deferred_;
 }
 
@@ -609,11 +605,17 @@ void BufferedResourceLoader::UpdateDeferBehavior() {
   if (!url_loader_.get() || !buffer_.get())
     return;
 
-  if ((deferred_ && ShouldDisableDefer()) ||
-      (!deferred_ && ShouldEnableDefer())) {
-    bool eventOccurred = ToggleDeferring();
-    if (eventOccurred)
-      NotifyNetworkEvent();
+  // If necessary, toggle defer state and continue/pause downloading data
+  // accordingly.
+  if (ShouldEnableDefer() || ShouldDisableDefer())
+    SetDeferred(!deferred_);
+}
+
+void BufferedResourceLoader::SetDeferred(bool deferred) {
+  deferred_ = deferred;
+  if (url_loader_.get()) {
+    url_loader_->setDefersLoading(deferred);
+    NotifyNetworkEvent();
   }
 }
 
@@ -668,15 +670,6 @@ bool BufferedResourceLoader::ShouldDisableDefer() {
   return false;
 }
 
-bool BufferedResourceLoader::ToggleDeferring() {
-  deferred_ = !deferred_;
-  if (url_loader_.get()) {
-    url_loader_->setDefersLoading(deferred_);
-    return true;
-  }
-  return false;
-}
-
 bool BufferedResourceLoader::CanFulfillRead() {
   // If we are reading too far in the backward direction.
   if (first_offset_ < 0 &&
diff --git a/webkit/glue/media/buffered_resource_loader.h b/webkit/glue/media/buffered_resource_loader.h
index 1b6d55f..50e2ae8 100644
--- a/webkit/glue/media/buffered_resource_loader.h
+++ b/webkit/glue/media/buffered_resource_loader.h
@@ -116,8 +116,8 @@ class BufferedResourceLoader
   // Returns true if the server supports byte range requests.
   virtual bool range_supported();
 
-  // Returns true if network is currently active.
-  virtual bool network_activity();
+  // Returns true if the resource loader is currently downloading data.
+  virtual bool is_downloading_data();
 
   // Returns resulting URL.
   virtual const GURL& url();
@@ -179,10 +179,6 @@ class BufferedResourceLoader
   // Updates the |buffer_|'s forward and backward capacities.
   void UpdateBufferWindow();
 
-  // Toggles whether the resource loading is deferred or not.
-  // Returns true if a network event was fired.
-  bool ToggleDeferring();
-
   // Returns true if we should defer resource loading, based
   // on current buffering scheme.
   bool ShouldEnableDefer();
@@ -194,6 +190,10 @@ class BufferedResourceLoader
   // Updates deferring behavior based on current buffering scheme.
   void UpdateDeferBehavior();
 
+  // Set defer state to |deferred| and cease/continue downloading data
+  // accordingly.
+  void SetDeferred(bool deferred);
+
   // Returns true if the current read request can be fulfilled by what is in
   // the buffer.
   bool CanFulfillRead();
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
index fd8d497..a7d6878 100644
--- a/webkit/glue/webmediaplayer_impl.cc
+++ b/webkit/glue/webmediaplayer_impl.cc
@@ -786,14 +786,12 @@ void WebMediaPlayerImpl::OnPipelineError(PipelineStatus error) {
   Repaint();
 }
 
-void WebMediaPlayerImpl::OnNetworkEvent(PipelineStatus status) {
+void WebMediaPlayerImpl::OnNetworkEvent(bool is_downloading_data) {
   DCHECK_EQ(main_loop_, MessageLoop::current());
-  if (status == media::PIPELINE_OK) {
-    if (pipeline_->IsNetworkActive())
-      SetNetworkState(WebKit::WebMediaPlayer::Loading);
-    else
-      SetNetworkState(WebKit::WebMediaPlayer::Idle);
-  }
+  if (is_downloading_data)
+    SetNetworkState(WebKit::WebMediaPlayer::Loading);
+  else
+    SetNetworkState(WebKit::WebMediaPlayer::Idle);
 }
 
 void WebMediaPlayerImpl::OnDemuxerOpened() {
diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h
index 7f1eb13..ea19d58 100644
--- a/webkit/glue/webmediaplayer_impl.h
+++ b/webkit/glue/webmediaplayer_impl.h
@@ -196,7 +196,7 @@ class WebMediaPlayerImpl
   void OnPipelineSeek(media::PipelineStatus status);
   void OnPipelineEnded(media::PipelineStatus status);
   void OnPipelineError(media::PipelineStatus error);
-  void OnNetworkEvent(media::PipelineStatus status);
+  void OnNetworkEvent(bool is_downloading_data);
   void OnDemuxerOpened();
 
  private:
diff --git a/webkit/glue/webmediaplayer_proxy.cc b/webkit/glue/webmediaplayer_proxy.cc
index 99071aa..3110f37 100644
--- a/webkit/glue/webmediaplayer_proxy.cc
+++ b/webkit/glue/webmediaplayer_proxy.cc
@@ -127,9 +127,9 @@ void WebMediaPlayerProxy::PipelineErrorCallback(PipelineStatus error) {
       this, &WebMediaPlayerProxy::PipelineErrorTask, error));
 }
 
-void WebMediaPlayerProxy::NetworkEventCallback(PipelineStatus status) {
+void WebMediaPlayerProxy::NetworkEventCallback(bool is_downloading_data) {
   render_loop_->PostTask(FROM_HERE, NewRunnableMethod(
-      this, &WebMediaPlayerProxy::NetworkEventTask, status));
+      this, &WebMediaPlayerProxy::NetworkEventTask, is_downloading_data));
 }
 
 void WebMediaPlayerProxy::AddDataSource(WebDataSource* data_source) {
@@ -151,37 +151,32 @@ void WebMediaPlayerProxy::RepaintTask() {
 
 void WebMediaPlayerProxy::PipelineInitializationTask(PipelineStatus status) {
   DCHECK(MessageLoop::current() == render_loop_);
-  if (webmediaplayer_) {
+  if (webmediaplayer_)
     webmediaplayer_->OnPipelineInitialize(status);
-  }
 }
 
 void WebMediaPlayerProxy::PipelineSeekTask(PipelineStatus status) {
   DCHECK(MessageLoop::current() == render_loop_);
-  if (webmediaplayer_) {
+  if (webmediaplayer_)
     webmediaplayer_->OnPipelineSeek(status);
-  }
 }
 
 void WebMediaPlayerProxy::PipelineEndedTask(PipelineStatus status) {
   DCHECK(MessageLoop::current() == render_loop_);
-  if (webmediaplayer_) {
+  if (webmediaplayer_)
     webmediaplayer_->OnPipelineEnded(status);
-  }
 }
 
 void WebMediaPlayerProxy::PipelineErrorTask(PipelineStatus error) {
   DCHECK(MessageLoop::current() == render_loop_);
-  if (webmediaplayer_) {
+  if (webmediaplayer_)
     webmediaplayer_->OnPipelineError(error);
-  }
 }
 
-void WebMediaPlayerProxy::NetworkEventTask(PipelineStatus status) {
+void WebMediaPlayerProxy::NetworkEventTask(bool is_downloading_data) {
   DCHECK(MessageLoop::current() == render_loop_);
-  if (webmediaplayer_) {
-    webmediaplayer_->OnNetworkEvent(status);
-  }
+  if (webmediaplayer_)
+    webmediaplayer_->OnNetworkEvent(is_downloading_data);
 }
 
 void WebMediaPlayerProxy::GetCurrentFrame(
diff --git a/webkit/glue/webmediaplayer_proxy.h b/webkit/glue/webmediaplayer_proxy.h
index 5dbc1bd..9fd3d25 100644
--- a/webkit/glue/webmediaplayer_proxy.h
+++ b/webkit/glue/webmediaplayer_proxy.h
@@ -52,7 +52,7 @@ class WebMediaPlayerProxy
   void PipelineSeekCallback(media::PipelineStatus status);
   void PipelineEndedCallback(media::PipelineStatus status);
   void PipelineErrorCallback(media::PipelineStatus error);
-  void NetworkEventCallback(media::PipelineStatus status);
+  void NetworkEventCallback(bool network_activity);
 
   // ChunkDemuxerClient implementation.
   virtual void DemuxerOpened(media::ChunkDemuxer* demuxer) OVERRIDE;
@@ -94,7 +94,7 @@ class WebMediaPlayerProxy
   void PipelineErrorTask(media::PipelineStatus error);
 
   // Notify |webmediaplayer_| that there's a network event.
-  void NetworkEventTask(media::PipelineStatus status);
+  void NetworkEventTask(bool network_activity);
 
   // The render message loop where WebKit lives.
   MessageLoop* render_loop_;