diff options
| author | Patrick Scott <phanna@android.com> | 2011-01-19 04:48:23 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-19 04:48:24 -0800 |
| commit | 07f392a57e45b228e53dd45cb7bd464edde5e23d (patch) | |
| tree | f61d330f86070ea0e22d57980fde9456d93bfa1b /WebKit | |
| parent | 1ff2438ab74668c3e80d2957db44214d79e099e0 (diff) | |
| parent | 32552b6c77d13df635d84345f5ddb3f5854185ea (diff) | |
| download | external_webkit-07f392a57e45b228e53dd45cb7bd464edde5e23d.zip external_webkit-07f392a57e45b228e53dd45cb7bd464edde5e23d.tar.gz external_webkit-07f392a57e45b228e53dd45cb7bd464edde5e23d.tar.bz2 | |
Merge "Do not send empty data." into honeycomb
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp b/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp index d6224e0..ed7ece7 100644 --- a/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp +++ b/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp @@ -302,7 +302,7 @@ void WebUrlLoaderClient::didReceiveResponse(PassOwnPtr<WebResponse> webResponse) void WebUrlLoaderClient::didReceiveData(scoped_refptr<net::IOBuffer> buf, int size) { - if (!isActive()) + if (!isActive() || !size) return; // didReceiveData will take a copy of the data @@ -313,7 +313,7 @@ void WebUrlLoaderClient::didReceiveData(scoped_refptr<net::IOBuffer> buf, int si // For data url's void WebUrlLoaderClient::didReceiveDataUrl(PassOwnPtr<std::string> str) { - if (!isActive()) + if (!isActive() || !str->size()) return; // didReceiveData will take a copy of the data @@ -323,7 +323,7 @@ void WebUrlLoaderClient::didReceiveDataUrl(PassOwnPtr<std::string> str) // For special android files void WebUrlLoaderClient::didReceiveAndroidFileData(PassOwnPtr<std::vector<char> > vector) { - if (!isActive()) + if (!isActive() || !vector->size()) return; // didReceiveData will take a copy of the data |