Merge 103008 - Cleaned up threadiness of BufferedDataSource.

webkit/glue/media/buffered_data_source.h

 // 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.
 
 #ifndef WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_H_
 #define WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "media/base/filter_factories.h"
 #include "media/base/filters.h"
 #include "webkit/glue/media/buffered_resource_loader.h"
 
 namespace media {
 class MediaLog;
 }
 
 namespace webkit_glue {
 
+// This class may be created on any thread, and is callable from the render
+// thread as well as media-specific threads.
 class BufferedDataSource : public WebDataSource {
  public:
   // Creates a DataSourceFactory for building BufferedDataSource objects.
   static media::DataSourceFactory* CreateFactory(
       MessageLoop* render_loop,
       WebKit::WebFrame* frame,
       media::MediaLog* media_log,
       WebDataSourceBuildObserverHack* build_observer);
 
   BufferedDataSource(MessageLoop* render_loop,
@@ skipping 85 matching lines @@
   void PartialReadStartCallback(int error);
 
   // Callback method for making a read request to BufferedResourceLoader.
   // If data arrives or the request has failed, this method is called with
   // the error code or the number of bytes read.
   void ReadCallback(int error);
 
   // Callback method when a network event is received.
   void NetworkEventCallback();
 
-  void UpdateHostState();
+  void UpdateHostState_Locked();
 
   // URL of the resource requested.
   GURL url_;
 
   // 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_;
@@ skipping 32 matching lines @@
   // Memory is allocated for this member during initialization of this object
   // because we want buffer to be passed into BufferedResourceLoader to be
   // always non-null. And by initializing this member with a default size we can
   // avoid creating zero-sized buffered if the first read has zero size.
   scoped_array<uint8> intermediate_read_buffer_;
   int intermediate_read_buffer_size_;
 
   // The message loop of the render thread.
   MessageLoop* render_loop_;
 
-  // Protects |stopped_|.
+  // Protects |stop_signal_received_|, |stopped_on_render_loop_| and
+  // |initialize_cb_|.
   base::Lock lock_;
 
   // Stop signal to suppressing activities. This variable is set on the pipeline
   // thread and read from the render thread.
   bool stop_signal_received_;
 
   // This variable is set by CleanupTask() that indicates this object is stopped
   // on the render thread and work should no longer progress.
   bool stopped_on_render_loop_;
 
@@ skipping 17 matching lines @@
   int cache_miss_retries_left_;
 
   scoped_refptr<media::MediaLog> media_log_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedDataSource);
 };
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_H_