Split BufferedResourceLoader's network callback into separate loading state and progress callbacks.

webkit/media/buffered_data_source.h

 // Copyright (c) 2012 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.
 
 #ifndef WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_
 #define WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 121 matching lines @@
   // a non-HTTP protocol, e.g. local files. This method is called when response
   // for initial request is received.
   void NonHttpInitialStartCallback(BufferedResourceLoader::Status status);
 
   // Callback method to be passed to BufferedResourceLoader during range
   // request. Once a resource request has started, this method will be called
   // with the error code. This method will be executed on the thread
   // BufferedResourceLoader lives, i.e. render thread.
   void PartialReadStartCallback(BufferedResourceLoader::Status status);
 
-  // Callback method for making a read request to BufferedResourceLoader.
+  // Read callback for BufferedResourceLoader.
   void ReadCallback(BufferedResourceLoader::Status status, int bytes_read);
 
-  // Callback method when a network event is received.
-  void NetworkEventCallback();
+  // Loading and progress callbacks for HTTP resources.
+  void HttpLoadingStateChangedCallback(
+      BufferedResourceLoader::LoadingState state);
+  void HttpProgressCallback(int64 position);
 
   void UpdateHostState_Locked();
 
   // URL of the resource requested.
   GURL url_;
   // crossorigin attribute on the corresponding HTML media element, if any.
   BufferedResourceLoader::CORSMode cors_mode_;
 
   // Members for total bytes of the requested object. It is written once on
   // render thread but may be read from any thread. However reading of this
   // member is guaranteed to happen after it is first written, so we don't
   // need to protect it.
   int64 total_bytes_;
   int64 buffered_bytes_;
 
   // This value will be true if this data source can only support streaming.
   // i.e. range request is not supported.
   bool streaming_;
 
   // A webframe for loading.
   WebKit::WebFrame* frame_;
 
   // A resource loader for the media resource.
   scoped_ptr<BufferedResourceLoader> loader_;
 
-  // True if |loader| is downloading data.
-  bool is_downloading_data_;
-
   // Callback method from the pipeline for initialization.
   media::PipelineStatusCB initialize_cb_;
 
   // Read parameters received from the Read() method call.
   media::DataSource::ReadCB read_cb_;
   int read_size_;
   uint8* read_buffer_;
   // Retained between reads to make sense of buffering information.
   int64 last_read_start_;
 
@@ skipping 45 matching lines @@
   scoped_refptr<media::MediaLog> media_log_;
 
   DownloadingCB downloading_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedDataSource);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_