Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Side by Side Diff: Source/web/WebSocketImpl.h

Issue 311993006: [WebSocket] bufferedAmount should not decrease inside a task. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 virtual unsigned long bufferedAmount() const OVERRIDE; 64 virtual unsigned long bufferedAmount() const OVERRIDE;
65 virtual void close(int code, const WebString& reason) OVERRIDE; 65 virtual void close(int code, const WebString& reason) OVERRIDE;
66 virtual void fail(const WebString& reason) OVERRIDE; 66 virtual void fail(const WebString& reason) OVERRIDE;
67 virtual void disconnect() OVERRIDE; 67 virtual void disconnect() OVERRIDE;
68 68
69 // WebSocketChannelClient 69 // WebSocketChannelClient
70 virtual void didConnect(const String& subprotocol, const String& extensions) OVERRIDE; 70 virtual void didConnect(const String& subprotocol, const String& extensions) OVERRIDE;
71 virtual void didReceiveMessage(const String& message) OVERRIDE; 71 virtual void didReceiveMessage(const String& message) OVERRIDE;
72 virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> > binaryData) OVER RIDE; 72 virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> > binaryData) OVER RIDE;
73 virtual void didReceiveMessageError() OVERRIDE; 73 virtual void didReceiveMessageError() OVERRIDE;
74 virtual void didUpdateBufferedAmount(unsigned long bufferedAmount) OVERRIDE; 74 virtual void didConsumeBufferedAmount(unsigned long consumed) OVERRIDE;
75 virtual void didStartClosingHandshake() OVERRIDE; 75 virtual void didStartClosingHandshake() OVERRIDE;
76 virtual void didClose(unsigned long bufferedAmount, ClosingHandshakeCompleti onStatus, unsigned short code, const String& reason) OVERRIDE; 76 virtual void didClose(ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) OVERRIDE;
77 77
78 private: 78 private:
79 RefPtrWillBePersistent<WebCore::WebSocketChannel> m_private; 79 RefPtrWillBePersistent<WebCore::WebSocketChannel> m_private;
80 WebSocketClient* m_client; 80 WebSocketClient* m_client;
81 BinaryType m_binaryType; 81 BinaryType m_binaryType;
82 WebString m_subprotocol; 82 WebString m_subprotocol;
83 WebString m_extensions; 83 WebString m_extensions;
84 bool m_isClosingOrClosed;
85 // m_bufferedAmount includes m_bufferedAmountAfterClose.
86 unsigned long m_bufferedAmount;
87 unsigned long m_bufferedAmountAfterClose;
84 }; 88 };
85 89
86 } // namespace blink 90 } // namespace blink
87 91
88 #endif // WebWebSocketChannelImpl_h 92 #endif // WebWebSocketChannelImpl_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698