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

trunk/Source/modules/websockets/MainThreadWebSocketChannel.h

 /*
  * 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 57 matching lines @@
         return adoptRefWillBeRefCountedGarbageCollected(new MainThreadWebSocketChannel(document, client, sourceURL, lineNumber));
     }
     virtual ~MainThreadWebSocketChannel();
 
     // WebSocketChannel functions.
     virtual bool connect(const KURL&, const String& protocol) OVERRIDE;
     virtual WebSocketChannel::SendResult send(const String& message) OVERRIDE;
     virtual WebSocketChannel::SendResult send(const ArrayBuffer&, unsigned byteOffset, unsigned byteLength) OVERRIDE;
     virtual WebSocketChannel::SendResult send(PassRefPtr<BlobDataHandle>) OVERRIDE;
     virtual WebSocketChannel::SendResult send(PassOwnPtr<Vector<char> > data) OVERRIDE;
+    virtual unsigned long bufferedAmount() const OVERRIDE;
     // Start closing handshake. Use the CloseEventCodeNotSpecified for the code
     // argument to omit payload.
     virtual void close(int code, const String& reason) OVERRIDE;
     virtual void fail(const String& reason, MessageLevel, const String&, unsigned lineNumber) OVERRIDE;
     virtual void disconnect() OVERRIDE;
 
     virtual void suspend() OVERRIDE;
     virtual void resume() OVERRIDE;
 
     // SocketStreamHandleClient functions.
     virtual void didOpenSocketStream(SocketStreamHandle*) OVERRIDE;
     virtual void didCloseSocketStream(SocketStreamHandle*) OVERRIDE;
     virtual void didReceiveSocketStreamData(SocketStreamHandle*, const char*, int) OVERRIDE;
-    virtual void didConsumeBufferedAmount(SocketStreamHandle*, size_t consumed) OVERRIDE;
+    virtual void didUpdateBufferedAmount(SocketStreamHandle*, size_t bufferedAmount) OVERRIDE;
     virtual void didFailSocketStream(SocketStreamHandle*, const SocketStreamError&) OVERRIDE;
 
     // FileReaderLoaderClient functions.
     virtual void didStartLoading() OVERRIDE;
     virtual void didReceiveData() OVERRIDE;
     virtual void didFinishLoading() OVERRIDE;
     virtual void didFail(FileError::ErrorCode) OVERRIDE;
 
 private:
     MainThreadWebSocketChannel(Document*, WebSocketChannelClient*, const String&, unsigned);
 
-    class FramingOverhead {
-    public:
-        FramingOverhead(WebSocketFrame::OpCode opcode, size_t frameDataSize, size_t originalPayloadLength)
-            : m_opcode(opcode)
-            , m_frameDataSize(frameDataSize)
-            , m_originalPayloadLength(originalPayloadLength)
-        {
-        }
-
-        WebSocketFrame::OpCode opcode() const { return m_opcode; }
-        size_t frameDataSize() const { return m_frameDataSize; }
-        size_t originalPayloadLength() const { return m_originalPayloadLength; }
-
-    private:
-        WebSocketFrame::OpCode m_opcode;
-        size_t m_frameDataSize;
-        size_t m_originalPayloadLength;
-    };
-
     void clearDocument();
 
     void disconnectHandle();
 
     // Calls didReceiveMessageError() on m_client if we haven't yet.
     void callDidReceiveMessageError();
 
     bool appendToBuffer(const char* data, size_t len);
     void skipBuffer(size_t len);
     // Repeats parsing data from m_buffer until instructed to stop.
@@ skipping 75 matching lines @@
 
     Timer<MainThreadWebSocketChannel> m_resumeTimer;
     bool m_suspended;
     bool m_didFailOfClientAlreadyRun;
     // Set to true iff this instance called disconnect() on m_handle.
     bool m_hasCalledDisconnectOnHandle;
     bool m_receivedClosingHandshake;
     Timer<MainThreadWebSocketChannel> m_closingTimer;
     ChannelState m_state;
     bool m_shouldDiscardReceivedData;
+    unsigned long m_unhandledBufferedAmount;
 
     unsigned long m_identifier; // m_identifier == 0 means that we could not obtain a valid identifier.
 
     // Private members only for hybi-10 protocol.
     bool m_hasContinuousFrame;
     WebSocketFrame::OpCode m_continuousFrameOpCode;
     Vector<char> m_continuousFrameData;
     unsigned short m_closeEventCode;
     String m_closeEventReason;
 
     Deque<OwnPtr<QueuedFrame> > m_outgoingFrameQueue;
     OutgoingFrameQueueStatus m_outgoingFrameQueueStatus;
-    Deque<FramingOverhead> m_framingOverheadQueue;
-    // The number of bytes that are already consumed (i.e. sent) in the
-    // current frame.
-    size_t m_numConsumedBytesInCurrentFrame;
 
     // FIXME: Load two or more Blobs simultaneously for better performance.
     OwnPtr<FileReaderLoader> m_blobLoader;
     BlobLoaderStatus m_blobLoaderStatus;
 
     // Source code position where construction happened. To be used to show a
     // console message where no JS callstack info available.
     String m_sourceURLAtConstruction;
     unsigned m_lineNumberAtConstruction;
 
     WebSocketPerMessageDeflate m_perMessageDeflate;
 
     WebSocketDeflateFramer m_deflateFramer;
 };
 
 } // namespace WebCore
 
 #endif // MainThreadWebSocketChannel_h