WebKit roll 83160:83167.

TBR=tkent

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80766 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 7 insertions, 43 deletions

diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc
index ef48e40..80943a9 100644
--- a/webkit/plugins/npapi/webplugin_impl.cc
+++ b/webkit/plugins/npapi/webplugin_impl.cc
@@ -110,8 +110,7 @@ class MultiPartResponseClient : public WebURLLoaderClient {
   }
 
   // Receives individual part data from a multipart response.
-  // FIXME(vsevik): rename once renamed in webkit
-  virtual void didReceiveData2(
+  virtual void didReceiveData(
       WebURLLoader*, const char* data, int data_length, int length_received) {
     // TODO(ananta)
     // We should defer further loads on multipart resources on the same lines
@@ -121,12 +120,6 @@ class MultiPartResponseClient : public WebURLLoaderClient {
     byte_range_lower_bound_ += data_length;
   }
 
-  // FIXME(vsevik): remove once removed in webkit
-  virtual void didReceiveData(
-      WebURLLoader* webURLLoader, const char* data, int data_length) {
-    didReceiveData2(webURLLoader, data, data_length, -1);
-  }
-
   virtual void didFinishLoading(WebURLLoader*, double finishTime) {}
   virtual void didFail(WebURLLoader*, const WebURLError&) {}
 
@@ -956,18 +949,10 @@ void WebPluginImpl::didReceiveResponse(WebURLLoader* loader,
   }
 }
 
-// FIXME(vsevik): remove once removed in webkit
 void WebPluginImpl::didReceiveData(WebURLLoader* loader,
                                    const char *buffer,
-                                   int data_length) {
-  didReceiveData2(loader, buffer, data_length, -1);
-}
-
-// FIXME(vsevik): rename once renamed in webkit
-void WebPluginImpl::didReceiveData2(WebURLLoader* loader,
-                                    const char *buffer,
-                                    int data_length,
-                                    int length_received) {
+                                   int data_length,
+                                   int length_received) {
   WebPluginResourceClient* client = GetClientFromLoader(loader);
   if (!client)
     return;
diff --git a/webkit/plugins/npapi/webplugin_impl.h b/webkit/plugins/npapi/webplugin_impl.h
index 0821ef7..85aef63 100644
--- a/webkit/plugins/npapi/webplugin_impl.h
+++ b/webkit/plugins/npapi/webplugin_impl.h
@@ -204,13 +204,8 @@ class WebPluginImpl : public WebPlugin,
   virtual void didReceiveResponse(WebKit::WebURLLoader* loader,
                                   const WebKit::WebURLResponse& response);
 
-  // FIXME(vsevik): remove once migrated to new webkit
   virtual void didReceiveData(WebKit::WebURLLoader* loader, const char *buffer,
-                              int data_length);
-
-  // FIXME(vsevik): rename once renamed in webkit
-  virtual void didReceiveData2(WebKit::WebURLLoader* loader, const char *buffer,
-                               int data_length, int length_received);
+                              int data_length, int length_received);
   virtual void didFinishLoading(WebKit::WebURLLoader* loader,
                                 double finishTime);
   virtual void didFail(WebKit::WebURLLoader* loader,
diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc
index 7049d35..cf5066a 100644
--- a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc
+++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc
@@ -152,9 +152,8 @@ 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_->didReceiveData2(NULL, data, data_length, data_length);
+    document_loader_->didReceiveData(NULL, data, data_length, data_length);
 }
 
 void WebPluginImpl::didFinishLoading() {
@@ -235,4 +234,3 @@ void WebPluginImpl::printEnd() {
 
 }  // namespace ppapi
 }  // namespace webkit
-
diff --git a/webkit/plugins/ppapi/ppb_url_loader_impl.cc b/webkit/plugins/ppapi/ppb_url_loader_impl.cc
index 2390443..7d0faed 100644
--- a/webkit/plugins/ppapi/ppb_url_loader_impl.cc
+++ b/webkit/plugins/ppapi/ppb_url_loader_impl.cc
@@ -420,18 +420,10 @@ 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) {
+                                        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 79b2ef5..4367114 100644
--- a/webkit/plugins/ppapi/ppb_url_loader_impl.h
+++ b/webkit/plugins/ppapi/ppb_url_loader_impl.h
@@ -77,13 +77,7 @@ class PPB_URLLoader_Impl : public Resource, public WebKit::WebURLLoaderClient {
   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);