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/plugins/ppapi | |
| 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/plugins/ppapi')
| -rw-r--r-- | webkit/plugins/ppapi/ppapi_webplugin_impl.cc | 3 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppb_url_loader_impl.cc | 9 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppb_url_loader_impl.h | 8 |
3 files changed, 19 insertions, 1 deletions
diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc index 8a35638..57ae78b 100644 --- a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc +++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc @@ -148,8 +148,9 @@ void WebPluginImpl::didReceiveResponse( } void WebPluginImpl::didReceiveData(const char* data, int data_length) { + // FIXME(vsevik): rename didReceiveData2 once renamed in webkit if (document_loader_) - document_loader_->didReceiveData(NULL, data, data_length); + document_loader_->didReceiveData2(NULL, data, data_length, data_length); } void WebPluginImpl::didFinishLoading() { diff --git a/webkit/plugins/ppapi/ppb_url_loader_impl.cc b/webkit/plugins/ppapi/ppb_url_loader_impl.cc index e73ec96..2390443 100644 --- a/webkit/plugins/ppapi/ppb_url_loader_impl.cc +++ b/webkit/plugins/ppapi/ppb_url_loader_impl.cc @@ -420,9 +420,18 @@ void PPB_URLLoader_Impl::didDownloadData(WebURLLoader* loader, UpdateStatus(); } +// FIXME(vsevik): remove once removed in webkit void PPB_URLLoader_Impl::didReceiveData(WebURLLoader* loader, const char* data, int data_length) { + didReceiveData2(loader, data, data_length, -1); +} + +// FIXME(vsevik): rename didReceiveData2 once renamed in webkit +void PPB_URLLoader_Impl::didReceiveData2(WebURLLoader* loader, + const char* data, + int data_length, + int length_received) { bytes_received_ += data_length; buffer_.insert(buffer_.end(), data, data + data_length); diff --git a/webkit/plugins/ppapi/ppb_url_loader_impl.h b/webkit/plugins/ppapi/ppb_url_loader_impl.h index 48b416d..79b2ef5 100644 --- a/webkit/plugins/ppapi/ppb_url_loader_impl.h +++ b/webkit/plugins/ppapi/ppb_url_loader_impl.h @@ -76,9 +76,17 @@ class PPB_URLLoader_Impl : public Resource, public WebKit::WebURLLoaderClient { const WebKit::WebURLResponse& response); virtual void didDownloadData(WebKit::WebURLLoader* loader, int data_length); + + // FIXME(vsevik): remove once removed in webkit virtual void didReceiveData(WebKit::WebURLLoader* loader, const char* data, int data_length); + + // FIXME(vsevik): rename didReceiveData2 once renamed in webkit + virtual void didReceiveData2(WebKit::WebURLLoader* loader, + const char* data, + int data_length, + int length_received); virtual void didFinishLoading(WebKit::WebURLLoader* loader, double finish_time); virtual void didFail(WebKit::WebURLLoader* loader, |