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

trunk/Source/modules/websockets/WebSocket.h

 /*
  * Copyright (C) 2011 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 102 matching lines @@
     virtual bool hasPendingActivity() const OVERRIDE;
     virtual void suspend() OVERRIDE;
     virtual void resume() OVERRIDE;
     virtual void stop() OVERRIDE;
 
     // WebSocketChannelClient functions.
     virtual void didConnect(const String& subprotocol, const String& extensions) OVERRIDE;
     virtual void didReceiveMessage(const String& message) OVERRIDE;
     virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> >) OVERRIDE;
     virtual void didReceiveMessageError() OVERRIDE;
-    virtual void didConsumeBufferedAmount(unsigned long) OVERRIDE;
+    virtual void didUpdateBufferedAmount(unsigned long bufferedAmount) OVERRIDE;
     virtual void didStartClosingHandshake() OVERRIDE;
-    virtual void didClose(ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) OVERRIDE;
+    virtual void didClose(unsigned long unhandledBufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) OVERRIDE;
 
     virtual void trace(Visitor*) OVERRIDE;
 
     static bool isValidSubprotocolString(const String&);
 
 protected:
     explicit WebSocket(ExecutionContext*);
 
 private:
     // FIXME: This should inherit WebCore::EventQueue.
@@ skipping 65 matching lines @@
 
     // Checks the result of WebSocketChannel::send() method, and:
     // - shows console message
     // - sets ExceptionState appropriately
     // - reports data for UMA.
     void handleSendResult(WebSocketChannel::SendResult, ExceptionState&, WebSocketSendType);
 
     // Updates m_bufferedAmountAfterClose given the amount of data passed to
     // send() method after the state changed to CLOSING or CLOSED.
     void updateBufferedAmountAfterClose(unsigned long);
-    void reflectBufferedAmountConsumption(Timer<WebSocket>*);
 
     void releaseChannel();
 
     enum BinaryType {
         BinaryTypeBlob,
         BinaryTypeArrayBuffer
     };
 
     RefPtrWillBeMember<WebSocketChannel> m_channel;
 
     State m_state;
     KURL m_url;
     unsigned long m_bufferedAmount;
-    // The consumed buffered amount that will be reflected to m_bufferedAmount
-    // later. It will be cleared once reflected.
-    unsigned long m_consumedBufferedAmount;
     unsigned long m_bufferedAmountAfterClose;
     BinaryType m_binaryType;
     // The subprotocol the server selected.
     String m_subprotocol;
     String m_extensions;
 
     RefPtrWillBeMember<EventQueue> m_eventQueue;
-    Timer<WebSocket> m_bufferedAmountConsumeTimer;
 };
 
 } // namespace WebCore
 
 #endif // WebSocket_h