diff options
| -rw-r--r-- | webkit/glue/media/buffered_data_source.cc | 12 | ||||
| -rw-r--r-- | webkit/glue/media/buffered_resource_loader.cc | 5 | ||||
| -rw-r--r-- | webkit/glue/media/buffered_resource_loader.h | 5 |
3 files changed, 11 insertions, 11 deletions
diff --git a/webkit/glue/media/buffered_data_source.cc b/webkit/glue/media/buffered_data_source.cc index c1aed27..8ddd5fa 100644 --- a/webkit/glue/media/buffered_data_source.cc +++ b/webkit/glue/media/buffered_data_source.cc @@ -79,7 +79,7 @@ base::TimeDelta BufferedDataSource::GetTimeoutMilliseconds() { } ///////////////////////////////////////////////////////////////////////////// -// BufferedDataSource, media::Filter implementation +// media::Filter implementation. void BufferedDataSource::Initialize(const std::string& url, media::FilterCallback* callback) { // Saves the url. @@ -134,7 +134,7 @@ void BufferedDataSource::SetPlaybackRate(float playback_rate) { } ///////////////////////////////////////////////////////////////////////////// -// BufferedDataSource, media::DataSource implementation +// media::DataSource implementation. void BufferedDataSource::Read(int64 position, size_t size, uint8* data, media::DataSource::ReadCallback* read_callback) { render_loop_->PostTask(FROM_HERE, @@ -175,7 +175,7 @@ void BufferedDataSource::Abort() { } ///////////////////////////////////////////////////////////////////////////// -// BufferedDataSource, render thread tasks +// Render thread tasks. void BufferedDataSource::InitializeTask() { DCHECK(MessageLoop::current() == render_loop_); DCHECK(!loader_.get()); @@ -373,9 +373,7 @@ void BufferedDataSource::DoneInitialization_Locked() { } ///////////////////////////////////////////////////////////////////////////// -// BufferedDataSource, callback methods. -// These methods are called on the render thread for the events reported by -// BufferedResourceLoader. +// BufferedResourceLoader callback methods. void BufferedDataSource::HttpInitialStartCallback(int error) { DCHECK(MessageLoop::current() == render_loop_); DCHECK(loader_.get()); @@ -402,7 +400,7 @@ void BufferedDataSource::HttpInitialStartCallback(int error) { // Assuming that the Range header was causing the problem. Retry without // the Range header. using_range_request_ = false; - loader_ = CreateResourceLoader(kPositionNotSpecified, + loader_ = CreateResourceLoader(kPositionNotSpecified, kPositionNotSpecified); loader_->Start( NewCallback(this, &BufferedDataSource::HttpInitialStartCallback), diff --git a/webkit/glue/media/buffered_resource_loader.cc b/webkit/glue/media/buffered_resource_loader.cc index 8045d07..61aac72 100644 --- a/webkit/glue/media/buffered_resource_loader.cc +++ b/webkit/glue/media/buffered_resource_loader.cc @@ -232,7 +232,8 @@ void BufferedResourceLoader::SetURLLoaderForTest(WebURLLoader* mock_loader) { keep_test_loader_ = true; } -// WebKit::WebURLLoaderClient implementations. +///////////////////////////////////////////////////////////////////////////// +// WebKit::WebURLLoaderClient implementation. void BufferedResourceLoader::willSendRequest( WebURLLoader* loader, WebURLRequest& newRequest, @@ -424,6 +425,8 @@ void BufferedResourceLoader::didFail( Release(); } +///////////////////////////////////////////////////////////////////////////// +// Helper methods. void BufferedResourceLoader::EnableDeferIfNeeded() { if (!defer_allowed_) return; diff --git a/webkit/glue/media/buffered_resource_loader.h b/webkit/glue/media/buffered_resource_loader.h index 8b5939e..09b05e6 100644 --- a/webkit/glue/media/buffered_resource_loader.h +++ b/webkit/glue/media/buffered_resource_loader.h @@ -111,8 +111,7 @@ class BufferedResourceLoader : // Used to inject a mock used for unittests. virtual void SetURLLoaderForTest(WebKit::WebURLLoader* mock_loader); - ///////////////////////////////////////////////////////////////////////////// - // WebKit::WebURLLoaderClient implementations. + // WebKit::WebURLLoaderClient implementation. virtual void willSendRequest( WebKit::WebURLLoader* loader, WebKit::WebURLRequest& newRequest, @@ -232,7 +231,7 @@ class BufferedResourceLoader : uint8* read_buffer_; // Offsets of the requested first byte and last byte in |buffer_|. They are - // written by VerifyRead(). + // written by Read(). int first_offset_; int last_offset_; |