summaryrefslogtreecommitdiffstats
path: root/webkit/glue/multipart_response_delegate.cc
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-07 13:28:04 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-07 13:28:04 +0000
commit780e83b7ad7a1f9e87eb46d39f00a6d5a6af16f5 (patch)
treeeff969ac6e86463e7792e3e02abb96174cd0bc48 /webkit/glue/multipart_response_delegate.cc
parentcfe23ea864bed327d6c71e2b56ba78b091821c28 (diff)
downloadchromium_src-780e83b7ad7a1f9e87eb46d39f00a6d5a6af16f5.zip
chromium_src-780e83b7ad7a1f9e87eb46d39f00a6d5a6af16f5.tar.gz
chromium_src-780e83b7ad7a1f9e87eb46d39f00a6d5a6af16f5.tar.bz2
WebKit roll 83160:83167.
TBR=tkent git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/multipart_response_delegate.cc')
-rw-r--r--webkit/glue/multipart_response_delegate.cc18
1 files changed, 8 insertions, 10 deletions
diff --git a/webkit/glue/multipart_response_delegate.cc b/webkit/glue/multipart_response_delegate.cc
index a32520e..53cdc3f 100644
--- a/webkit/glue/multipart_response_delegate.cc
+++ b/webkit/glue/multipart_response_delegate.cc
@@ -138,10 +138,10 @@ void MultipartResponseDelegate::OnReceivedData(const char* data,
}
if (data_length > 0) {
// Send the last data chunk.
- // FIXME(vsevik): rename once renamed in webkit
- client_->didReceiveData2(loader_,
- data_.data(),
- static_cast<int>(data_length), -1);
+ client_->didReceiveData(loader_,
+ data_.data(),
+ static_cast<int>(data_length),
+ -1);
}
}
size_t boundary_end_pos = boundary_pos + boundary_.length();
@@ -171,9 +171,8 @@ void MultipartResponseDelegate::OnReceivedData(const char* data,
int send_length = data_.length() - boundary_.length();
if (data_[data_.length() - 1] == '\n')
send_length = data_.length();
- // FIXME(vsevik): rename didReceiveData2 once renamed in webkit
if (client_)
- client_->didReceiveData2(loader_, data_.data(), send_length, -1);
+ client_->didReceiveData(loader_, data_.data(), send_length, -1);
data_ = data_.substr(send_length);
}
}
@@ -182,10 +181,9 @@ void MultipartResponseDelegate::OnCompletedRequest() {
// If we have any pending data and we're not in a header, go ahead and send
// it to WebCore.
if (!processing_headers_ && !data_.empty() && !stop_sending_ && client_) {
- // FIXME(vsevik): rename didReceiveData2 once renamed in webkit
- client_->didReceiveData2(loader_,
- data_.data(),
- static_cast<int>(data_.length()), -1);
+ client_->didReceiveData(loader_,
+ data_.data(),
+ static_cast<int>(data_.length()), -1);
}
}