[WebSocket] bufferedAmount should not decrease inside a task.

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_isClosingOrClosed(false)
+    , m_bufferedAmount(0)
+    , m_bufferedAmountAfterClose(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)
 {
+    size_t size = message.utf8().length();
+    m_bufferedAmount += size;
+    if (m_isClosingOrClosed)
+        m_bufferedAmountAfterClose += size;
+
+    // Deprecate this call.

[tyoshino (SeeGerritForStatus), 2014/06/19 07:38:54]

FIXME

[yhirano, 2014/06/19 07:49:43]

Done.

+    m_client->didUpdateBufferedAmount(m_bufferedAmount);
+
     return m_private->send(message) == WebSocketChannel::SendSuccess;
 }
 
 bool WebSocketImpl::sendArrayBuffer(const WebArrayBuffer& webArrayBuffer)
 {
+    size_t size = webArrayBuffer.byteLength();
+    m_bufferedAmount += size;
+    if (m_isClosingOrClosed)
+        m_bufferedAmountAfterClose += size;
+
+    // Deprecate this call.

[tyoshino (SeeGerritForStatus), 2014/06/19 07:38:54]

FIXME

[yhirano, 2014/06/19 07:49:43]

Done.

+    m_client->didUpdateBufferedAmount(m_bufferedAmount);
+
     return m_private->send(*PassRefPtr<ArrayBuffer>(webArrayBuffer), 0, webArrayBuffer.byteLength()) == WebSocketChannel::SendSuccess;
 }
 
 unsigned long WebSocketImpl::bufferedAmount() const
 {
-    return m_private->bufferedAmount();
+    return m_bufferedAmount;
 }
 
 void WebSocketImpl::close(int code, const WebString& reason)
 {
+    m_isClosingOrClosed = true;
     m_private->close(code, reason);
 }
 
 void WebSocketImpl::fail(const WebString& reason)
 {
     m_private->fail(reason, ErrorMessageLevel, String(), 0);
 }
 
 void WebSocketImpl::disconnect()
 {
     m_private->disconnect();
     m_client = 0;
 }
 
 void WebSocketImpl::didConnect(const String& subprotocol, const String& extensions)
 {
+    m_client->didConnect(subprotocol, extensions);
+
+    // FIXME: Deprecate these statements.
     m_subprotocol = subprotocol;
     m_extensions = extensions;
     m_client->didConnect();
 }
 
 void WebSocketImpl::didReceiveMessage(const String& message)
 {
     m_client->didReceiveMessage(WebString(message));
 }
 
 void WebSocketImpl::didReceiveBinaryData(PassOwnPtr<Vector<char> > binaryData)
 {
     switch (m_binaryType) {
     case BinaryTypeBlob:
         // FIXME: Handle Blob after supporting WebBlob.
         break;
     case BinaryTypeArrayBuffer:
         m_client->didReceiveArrayBuffer(WebArrayBuffer(ArrayBuffer::create(binaryData->data(), binaryData->size())));
         break;
     }
 }
 
 void WebSocketImpl::didReceiveMessageError()
 {
     m_client->didReceiveMessageError();
 }
 
-void WebSocketImpl::didUpdateBufferedAmount(unsigned long bufferedAmount)
+void WebSocketImpl::didConsumeBufferedAmount(unsigned long consumed)
 {
-    m_client->didUpdateBufferedAmount(bufferedAmount);
+    m_client->didConsumeBufferedAmount(consumed);
+
+    // FIXME: Deprecate the following statements.
+    m_bufferedAmount -= consumed;
+    m_client->didUpdateBufferedAmount(m_bufferedAmount);
 }
 
 void WebSocketImpl::didStartClosingHandshake()
 {
     m_client->didStartClosingHandshake();
 }
 
-void WebSocketImpl::didClose(unsigned long bufferedAmount, ClosingHandshakeCompletionStatus status, unsigned short code, const String& reason)
+void WebSocketImpl::didClose(ClosingHandshakeCompletionStatus status, unsigned short code, const String& reason)
 {
-    m_client->didClose(bufferedAmount, static_cast<WebSocketClient::ClosingHandshakeCompletionStatus>(status), code, WebString(reason));
+    m_isClosingOrClosed = true;
+    m_client->didClose(static_cast<WebSocketClient::ClosingHandshakeCompletionStatus>(status), code, WebString(reason));
+
+    // Deprecate this call.
+    m_client->didClose(m_bufferedAmount - m_bufferedAmountAfterClose, static_cast<WebSocketClient::ClosingHandshakeCompletionStatus>(status), code, WebString(reason));
 }
 
 } // namespace blink