summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-27 03:48:08 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-27 03:48:08 +0000
commit4b40fccbc3dce6f081cd741b2404d82e02eb7e5b (patch)
tree07d60996c1a317e4ba28bf84beedfdb9e3c7cbc2 /webkit
parent562b222ad53049a87f695e450e8698d3cb2aa1d6 (diff)
downloadchromium_src-4b40fccbc3dce6f081cd741b2404d82e02eb7e5b.zip
chromium_src-4b40fccbc3dce6f081cd741b2404d82e02eb7e5b.tar.gz
chromium_src-4b40fccbc3dce6f081cd741b2404d82e02eb7e5b.tar.bz2
Merging SeekableBuffer and BufferQueue:
1. Removed SeekableBuffer::Buffer. 2. Extended SeekableBuffer to support all the features of BufferQueue. 3. BufferQueue removed and replaced with SeekableBuffer. BUG=28654 TEST=none Review URL: http://codereview.chromium.org/1736012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/media/buffered_data_source.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/media/buffered_data_source.cc b/webkit/glue/media/buffered_data_source.cc
index 05aa634..bf91da0 100644
--- a/webkit/glue/media/buffered_data_source.cc
+++ b/webkit/glue/media/buffered_data_source.cc
@@ -321,7 +321,7 @@ void BufferedResourceLoader::OnReceivedData(const char* data, int len) {
return;
// Writes more data to |buffer_|.
- buffer_->Append(len, reinterpret_cast<const uint8*>(data));
+ buffer_->Append(reinterpret_cast<const uint8*>(data), len);
// If there is an active read request, try to fulfill the request.
if (HasPendingRead() && CanFulfillRead()) {
@@ -451,7 +451,7 @@ void BufferedResourceLoader::ReadInternal() {
DCHECK(ret);
// Then do the read.
- int read = static_cast<int>(buffer_->Read(read_size_, read_buffer_));
+ int read = static_cast<int>(buffer_->Read(read_buffer_, read_size_));
offset_ += first_offset_ + read;
// And report with what we have read.