Adding callback support to media filter Initialize() and Seek().

webkit/glue/media/simple_data_source.cc

 // Copyright (c) 2009 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 "base/message_loop.h"
 #include "base/process_util.h"
 #include "media/base/filter_host.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_status.h"
@@ skipping 37 matching lines @@
 
 void SimpleDataSource::Stop() {
   AutoLock auto_lock(lock_);
   state_ = STOPPED;
 
   // Post a task to the render thread to cancel loading the resource.
   render_loop_->PostTask(FROM_HERE,
       NewRunnableMethod(this, &SimpleDataSource::CancelTask));
 }
 
-bool SimpleDataSource::Initialize(const std::string& url) {
+void SimpleDataSource::Initialize(const std::string& url,
+                                  media::FilterCallback* callback) {
   AutoLock auto_lock(lock_);
   DCHECK_EQ(state_, UNINITIALIZED);
+  DCHECK(callback);
   state_ = INITIALIZING;
+  initialize_callback_.reset(callback);
 
   // Validate the URL.
   SetURL(GURL(url));
   if (!url_.is_valid() || !IsSchemeSupported(url_)) {
     host()->Error(media::PIPELINE_ERROR_NETWORK);
-    return false;
+    initialize_callback_->Run();
+    initialize_callback_.reset();
+    return;
   }
 
   // Post a task to the render thread to start loading the resource.
   render_loop_->PostTask(FROM_HERE,
       NewRunnableMethod(this, &SimpleDataSource::StartTask));
-  return true;
 }
 
 const media::MediaFormat& SimpleDataSource::media_format() {
   return media_format_;
 }
 
 size_t SimpleDataSource::Read(uint8* data, size_t size) {
   DCHECK_GE(size_, 0);
   size_t copied = std::min(size, static_cast<size_t>(size_ - position_));
   memcpy(data, data_.c_str() + position_, copied);
@@ skipping 53 matching lines @@
   DCHECK_EQ(state_, INITIALIZING);
   DCHECK(bridge_.get());
   bridge_.reset();
 
   // If we don't get a content length or the request has failed, report it
   // as a network error.
   DCHECK(size_ == -1 || size_ == data_.length());
   if (size_ == -1) {
     size_ = data_.length();
   }
-  if (!status.is_success()) {
-    host()->Error(media::PIPELINE_ERROR_NETWORK);
-    return;
-  }
 
   // We're initialized!
-  state_ = INITIALIZED;
-  host()->SetTotalBytes(size_);
-  host()->SetBufferedBytes(size_);
-  host()->InitializationComplete();
+  if (status.is_success()) {
+    state_ = INITIALIZED;
+    host()->SetTotalBytes(size_);
+    host()->SetBufferedBytes(size_);
+  } else {
+    host()->Error(media::PIPELINE_ERROR_NETWORK);
+  }
+  initialize_callback_->Run();
+  initialize_callback_.reset();
 }
 
 std::string SimpleDataSource::GetURLForDebugging() {
   return url_.spec();
 }
 
 void SimpleDataSource::SetURL(const GURL& url) {
   url_ = url;
   media_format_.Clear();
   media_format_.SetAsString(media::MediaFormat::kMimeType,
@@ skipping 22 matching lines @@
   DCHECK_EQ(state_, STOPPED);
 
   // Cancel any pending requests.
   if (bridge_.get()) {
     bridge_->Cancel();
     bridge_.reset();
   }
 }
 
 }  // namespace webkit_glue