Fold WebDataSource into BufferedDataSource.

webkit/media/buffered_data_source.cc

 // 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.
 
 #include "webkit/media/buffered_data_source.h"
 
 #include "base/bind.h"
+#include "base/message_loop.h"
 #include "media/base/media_log.h"
 #include "net/base/net_errors.h"
 
 using WebKit::WebFrame;
 
 namespace webkit_media {
 
 // BufferedDataSource has an intermediate buffer, this value governs the initial
 // size of that buffer. It is set to 32KB because this is a typical read size
 // of FFmpeg.
@@ skipping 82 matching lines @@
   // the full range of the resource to obtain the instance size because
   // we won't be served HTTP headers.
   loader_.reset(CreateResourceLoader(kPositionNotSpecified,
                                      kPositionNotSpecified));
   loader_->Start(
       base::Bind(&BufferedDataSource::NonHttpInitialStartCallback, this),
       base::Bind(&BufferedDataSource::NetworkEventCallback, this),
       frame_);
 }
 
+bool BufferedDataSource::HasSingleOrigin() {
+  DCHECK(MessageLoop::current() == render_loop_);
+  return loader_.get() ? loader_->HasSingleOrigin() : true;

[Ami GONE FROM CHROMIUM, 2012/03/27 05:16:19]

(predates your CL, but)
Is it right to default open like this, or should this be a DCHECK(loader_) to
prevent being asked this question before Initialize() is called, and thus before
we can pass a judgement on the single-origin-ness of this object?
(I worry about someone caching the answer and then Initializing with a
not-single-origin URL/loader).

[scherkus (not reviewing), 2012/03/27 14:10:06]

Good catch!

Technically we can get a false value even if loader_ exists (i.e., BRL hasn't
received an HTTP response yet so it returns default value).

DCHECK() added to make sure initialization has completed.

+}
+
+void BufferedDataSource::Abort() {
+  DCHECK(MessageLoop::current() == render_loop_);
+
+  CleanupTask();
+  frame_ = NULL;
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // media::Filter implementation.
 void BufferedDataSource::Stop(const base::Closure& closure) {
   {
     base::AutoLock auto_lock(lock_);
     stop_signal_received_ = true;
   }
   if (!closure.is_null())
     closure.Run();
 
@@ skipping 47 matching lines @@
     return true;
   }
   *size_out = 0;
   return false;
 }
 
 bool BufferedDataSource::IsStreaming() {
   return streaming_;
 }
 
-bool BufferedDataSource::HasSingleOrigin() {
-  DCHECK(MessageLoop::current() == render_loop_);
-  return loader_.get() ? loader_->HasSingleOrigin() : true;
-}
-
-void BufferedDataSource::Abort() {
-  DCHECK(MessageLoop::current() == render_loop_);
-
-  CleanupTask();
-  frame_ = NULL;
-}
-
 /////////////////////////////////////////////////////////////////////////////
 // Render thread tasks.
 void BufferedDataSource::ReadTask(
     int64 position,
     int read_size,
     uint8* buffer) {
   DCHECK(MessageLoop::current() == render_loop_);
   {
     base::AutoLock auto_lock(lock_);
     if (stopped_on_render_loop_)
@@ skipping 388 matching lines @@
 
   if (!host())
     return;
 
   if (total_bytes_ != kPositionNotSpecified)
     host()->SetTotalBytes(total_bytes_);
   host()->SetBufferedBytes(buffered_bytes_);
 }
 
 }  // namespace webkit_media