Revert 176298 "[WebSocket] bufferedAmount should not decrease in..."

trunk/Source/web/WebSocketImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 24 matching lines @@
 #include "core/dom/Document.h"
 #include "core/frame/ConsoleTypes.h"
 #include "modules/websockets/MainThreadWebSocketChannel.h"
 #include "modules/websockets/NewWebSocketChannelImpl.h"
 #include "modules/websockets/WebSocketChannel.h"
 #include "public/platform/WebArrayBuffer.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 #include "public/web/WebDocument.h"
 #include "wtf/ArrayBuffer.h"
-#include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
 
 using namespace WebCore;
 
 namespace blink {
 
 WebSocketImpl::WebSocketImpl(const WebDocument& document, WebSocketClient* client)
     : m_client(client)
     , m_binaryType(BinaryTypeBlob)
-    , m_bufferedAmount(0)
 {
     RefPtrWillBeRawPtr<Document> coreDocument = PassRefPtrWillBeRawPtr<Document>(document);
     if (RuntimeEnabledFeatures::experimentalWebSocketEnabled()) {
         m_private = NewWebSocketChannelImpl::create(coreDocument.get(), this);
     } else {
         m_private = MainThreadWebSocketChannel::create(coreDocument.get(), this);
     }
 }
 
 WebSocketImpl::~WebSocketImpl()
@@ skipping 24 matching lines @@
     return m_subprotocol;
 }
 
 WebString WebSocketImpl::extensions()
 {
     return m_extensions;
 }
 
 bool WebSocketImpl::sendText(const WebString& message)
 {
-    m_bufferedAmount += message.utf8().length();
     return m_private->send(message) == WebSocketChannel::SendSuccess;
 }
 
 bool WebSocketImpl::sendArrayBuffer(const WebArrayBuffer& webArrayBuffer)
 {
-    m_bufferedAmount += webArrayBuffer.byteLength();
     return m_private->send(*PassRefPtr<ArrayBuffer>(webArrayBuffer), 0, webArrayBuffer.byteLength()) == WebSocketChannel::SendSuccess;
 }
 
 unsigned long WebSocketImpl::bufferedAmount() const
 {
-    return m_bufferedAmount;
+    return m_private->bufferedAmount();
 }
 
 void WebSocketImpl::close(int code, const WebString& reason)
 {
     m_private->close(code, reason);
 }
 
 void WebSocketImpl::fail(const WebString& reason)
 {
     m_private->fail(reason, ErrorMessageLevel, String(), 0);
@@ skipping 27 matching lines @@
         m_client->didReceiveArrayBuffer(WebArrayBuffer(ArrayBuffer::create(binaryData->data(), binaryData->size())));
         break;
     }
 }
 
 void WebSocketImpl::didReceiveMessageError()
 {
     m_client->didReceiveMessageError();
 }
 
-void WebSocketImpl::didConsumeBufferedAmount(unsigned long consumed)
+void WebSocketImpl::didUpdateBufferedAmount(unsigned long bufferedAmount)
 {
-    m_bufferedAmount -= consumed;
+    m_client->didUpdateBufferedAmount(bufferedAmount);
 }
 
 void WebSocketImpl::didStartClosingHandshake()
 {
     m_client->didStartClosingHandshake();
 }
 
-void WebSocketImpl::didClose(ClosingHandshakeCompletionStatus status, unsigned short code, const String& reason)
+void WebSocketImpl::didClose(unsigned long bufferedAmount, ClosingHandshakeCompletionStatus status, unsigned short code, const String& reason)
 {
-    m_client->didClose(m_bufferedAmount, static_cast<WebSocketClient::ClosingHandshakeCompletionStatus>(status), code, WebString(reason));
+    m_client->didClose(bufferedAmount, static_cast<WebSocketClient::ClosingHandshakeCompletionStatus>(status), code, WebString(reason));
 }
 
 } // namespace blink