diff options
author | vsevik@chromium.org <vsevik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-31 19:01:48 +0000 |
---|---|---|
committer | vsevik@chromium.org <vsevik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-31 19:01:48 +0000 |
commit | c7d5601fa3df36215e46de17d5699b40bce82fa4 (patch) | |
tree | 351e51d291a64939e25a14a6e78f2ec9f88e3906 /webkit/glue/media | |
parent | c4bc58d55fb1b29f69fc1bccc93b74e56c99b010 (diff) | |
download | chromium_src-c7d5601fa3df36215e46de17d5699b40bce82fa4.zip chromium_src-c7d5601fa3df36215e46de17d5699b40bce82fa4.tar.gz chromium_src-c7d5601fa3df36215e46de17d5699b40bce82fa4.tar.bz2 |
Migrated chromium to new didReceiveData method in WebURLLoaderClient
BUG=40502
Review URL: http://codereview.chromium.org/6737026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80039 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/media')
-rw-r--r-- | webkit/glue/media/buffered_resource_loader.cc | 10 | ||||
-rw-r--r-- | webkit/glue/media/buffered_resource_loader.h | 10 | ||||
-rw-r--r-- | webkit/glue/media/buffered_resource_loader_unittest.cc | 6 |
3 files changed, 23 insertions, 3 deletions
diff --git a/webkit/glue/media/buffered_resource_loader.cc b/webkit/glue/media/buffered_resource_loader.cc index c6295bf..5adb76f 100644 --- a/webkit/glue/media/buffered_resource_loader.cc +++ b/webkit/glue/media/buffered_resource_loader.cc @@ -318,10 +318,20 @@ void BufferedResourceLoader::didReceiveResponse( DoneStart(net::OK); } +// FIXME(vsevik): remove once removed in webkit void BufferedResourceLoader::didReceiveData( WebURLLoader* loader, const char* data, int data_length) { + didReceiveData2(loader, data, data_length, -1); +} + +// FIXME(vsevik): rename once renamed in webkit +void BufferedResourceLoader::didReceiveData2( + WebURLLoader* loader, + const char* data, + int data_length, + int length_received) { DCHECK(!completed_); DCHECK_GT(data_length, 0); diff --git a/webkit/glue/media/buffered_resource_loader.h b/webkit/glue/media/buffered_resource_loader.h index 4d76adc..3e04b43 100644 --- a/webkit/glue/media/buffered_resource_loader.h +++ b/webkit/glue/media/buffered_resource_loader.h @@ -124,7 +124,15 @@ class BufferedResourceLoader : const WebKit::WebURLResponse& response); virtual void didDownloadData( WebKit::WebURLLoader* loader, - int dataLength); + int data_length); + // FIXME(vsevik): rename once renamed in webkit + virtual void didReceiveData2( + WebKit::WebURLLoader* loader, + const char* data, + int data_length, + int length_received); + + // FIXME(vsevik): remove once removed in webkit virtual void didReceiveData( WebKit::WebURLLoader* loader, const char* data, diff --git a/webkit/glue/media/buffered_resource_loader_unittest.cc b/webkit/glue/media/buffered_resource_loader_unittest.cc index aef44ca..bb6e7d9 100644 --- a/webkit/glue/media/buffered_resource_loader_unittest.cc +++ b/webkit/glue/media/buffered_resource_loader_unittest.cc @@ -159,8 +159,10 @@ class BufferedResourceLoaderTest : public testing::Test { void WriteLoader(int position, int size) { EXPECT_CALL(*this, NetworkCallback()) .RetiresOnSaturation(); - loader_->didReceiveData(url_loader_, - reinterpret_cast<char*>(data_ + position), size); + // FIXME(vsevik): rename once renamed in webkit + loader_->didReceiveData2(url_loader_, + reinterpret_cast<char*>(data_ + position), size, + size); } // Helper method to read from |loader_|. |