Index: trunk/src/net/websockets/websocket_job.cc |
=================================================================== |
--- trunk/src/net/websockets/websocket_job.cc (revision 194561) |
+++ trunk/src/net/websockets/websocket_job.cc (working copy) |
@@ -9,10 +9,10 @@ |
#include "base/bind.h" |
#include "base/lazy_instance.h" |
#include "googleurl/src/gurl.h" |
-#include "net/base/io_buffer.h" |
#include "net/base/net_errors.h" |
#include "net/base/net_log.h" |
#include "net/cookies/cookie_store.h" |
+#include "net/base/io_buffer.h" |
#include "net/http/http_network_session.h" |
#include "net/http/http_transaction_factory.h" |
#include "net/http/http_util.h" |
@@ -330,19 +330,14 @@ |
OnSentData(socket_, static_cast<int>(bytes_sent)); |
} |
-void WebSocketJob::OnReceivedSpdyData(scoped_ptr<SpdyBuffer> buffer) { |
+void WebSocketJob::OnReceivedSpdyData(const char* data, int length) { |
DCHECK_NE(INITIALIZED, state_); |
DCHECK_NE(CONNECTING, state_); |
if (state_ == CLOSED) |
return; |
if (!spdy_websocket_stream_.get()) |
return; |
- if (buffer) { |
- OnReceivedData(socket_, buffer->GetRemainingData(), |
- buffer->GetRemainingSize()); |
- } else { |
- OnReceivedData(socket_, NULL, 0); |
- } |
+ OnReceivedData(socket_, data, length); |
} |
void WebSocketJob::OnCloseSpdyStream() { |