diff options
Diffstat (limited to 'webkit/plugins')
| -rw-r--r-- | webkit/plugins/npapi/webplugin_impl.cc | 12 | ||||
| -rw-r--r-- | webkit/plugins/npapi/webplugin_impl.h | 2 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppb_url_loader_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppb_url_loader_impl.h | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc index aafcc76..687809f 100644 --- a/webkit/plugins/npapi/webplugin_impl.cc +++ b/webkit/plugins/npapi/webplugin_impl.cc @@ -110,8 +110,10 @@ class MultiPartResponseClient : public WebURLLoaderClient { } // Receives individual part data from a multipart response. - virtual void didReceiveData( - WebURLLoader*, const char* data, int data_length, int raw_data_length) { + virtual void didReceiveData(WebURLLoader*, + const char* data, + int data_length, + int encoded_data_length) { // TODO(ananta) // We should defer further loads on multipart resources on the same lines // as regular resources requested by plugins to prevent reentrancy. @@ -952,7 +954,7 @@ void WebPluginImpl::didReceiveResponse(WebURLLoader* loader, void WebPluginImpl::didReceiveData(WebURLLoader* loader, const char *buffer, int data_length, - int raw_data_length) { + int encoded_data_length) { WebPluginResourceClient* client = GetClientFromLoader(loader); if (!client) return; @@ -962,7 +964,9 @@ void WebPluginImpl::didReceiveData(WebURLLoader* loader, if (index != multi_part_response_map_.end()) { MultipartResponseDelegate* multi_part_handler = (*index).second; DCHECK(multi_part_handler != NULL); - multi_part_handler->OnReceivedData(buffer, data_length, raw_data_length); + multi_part_handler->OnReceivedData(buffer, + data_length, + encoded_data_length); } else { loader->setDefersLoading(true); client->DidReceiveData(buffer, data_length, 0); diff --git a/webkit/plugins/npapi/webplugin_impl.h b/webkit/plugins/npapi/webplugin_impl.h index 966dc0e..097296b 100644 --- a/webkit/plugins/npapi/webplugin_impl.h +++ b/webkit/plugins/npapi/webplugin_impl.h @@ -205,7 +205,7 @@ class WebPluginImpl : public WebPlugin, const WebKit::WebURLResponse& response); virtual void didReceiveData(WebKit::WebURLLoader* loader, const char *buffer, - int data_length, int raw_data_length); + int data_length, int encoded_data_length); virtual void didFinishLoading(WebKit::WebURLLoader* loader, double finishTime); virtual void didFail(WebKit::WebURLLoader* loader, diff --git a/webkit/plugins/ppapi/ppb_url_loader_impl.cc b/webkit/plugins/ppapi/ppb_url_loader_impl.cc index bb2621e..1c2323e 100644 --- a/webkit/plugins/ppapi/ppb_url_loader_impl.cc +++ b/webkit/plugins/ppapi/ppb_url_loader_impl.cc @@ -423,7 +423,7 @@ void PPB_URLLoader_Impl::didDownloadData(WebURLLoader* loader, void PPB_URLLoader_Impl::didReceiveData(WebURLLoader* loader, const char* data, int data_length, - int raw_data_length) { + int encoded_data_length) { 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 3bc8dc1..6456900 100644 --- a/webkit/plugins/ppapi/ppb_url_loader_impl.h +++ b/webkit/plugins/ppapi/ppb_url_loader_impl.h @@ -80,7 +80,7 @@ class PPB_URLLoader_Impl : public Resource, public WebKit::WebURLLoaderClient { virtual void didReceiveData(WebKit::WebURLLoader* loader, const char* data, int data_length, - int raw_data_length); + int encoded_data_length); virtual void didFinishLoading(WebKit::WebURLLoader* loader, double finish_time); virtual void didFail(WebKit::WebURLLoader* loader, |