Source/modules/websockets/MainThreadWebSocketChannel.h - Issue 14320014: Make the WebSocket fail messages meaningful

Side by Side Diff: Source/modules/websockets/MainThreadWebSocketChannel.h

Issue 14320014: Make the WebSocket fail messages meaningful (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 7 years, 8 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

« no previous file with comments | « LayoutTests/http/tests/websocket/tests/hybi/too-long-payload-expected.txt ('k') | Source/modules/websockets/MainThreadWebSocketChannel.cpp » ('j') | Source/modules/websockets/MainThreadWebSocketChannel.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 14 matching lines...) Expand all Loading...
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY	25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE	27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

29 */	29 */

30	30

31 #ifndef MainThreadWebSocketChannel_h	31 #ifndef MainThreadWebSocketChannel_h

32 #define MainThreadWebSocketChannel_h	32 #define MainThreadWebSocketChannel_h

33	33

34 #include "FileReaderLoaderClient.h"	34 #include "FileReaderLoaderClient.h"

	35 #include "ScriptCallFrame.h"

35 #include "SocketStreamHandleClient.h"	36 #include "SocketStreamHandleClient.h"

36 #include "Timer.h"	37 #include "Timer.h"

37 #include "WebSocketChannel.h"	38 #include "WebSocketChannel.h"

38 #include "WebSocketDeflateFramer.h"	39 #include "WebSocketDeflateFramer.h"

39 #include "WebSocketFrame.h"	40 #include "WebSocketFrame.h"

40 #include "WebSocketHandshake.h"	41 #include "WebSocketHandshake.h"

41 #include <wtf/Deque.h>	42 #include <wtf/Deque.h>

42 #include <wtf/Forward.h>	43 #include <wtf/Forward.h>

43 #include <wtf/RefCounted.h>	44 #include <wtf/RefCounted.h>

44 #include <wtf/Vector.h>	45 #include <wtf/Vector.h>

(...skipping 146 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
191 unsigned short m_closeEventCode;	192 unsigned short m_closeEventCode;

192 String m_closeEventReason;	193 String m_closeEventReason;

193	194

194 Deque<OwnPtr<QueuedFrame> > m_outgoingFrameQueue;	195 Deque<OwnPtr<QueuedFrame> > m_outgoingFrameQueue;

195 OutgoingFrameQueueStatus m_outgoingFrameQueueStatus;	196 OutgoingFrameQueueStatus m_outgoingFrameQueueStatus;

196	197

197 // FIXME: Load two or more Blobs simultaneously for better performance.	198 // FIXME: Load two or more Blobs simultaneously for better performance.

198 OwnPtr<FileReaderLoader> m_blobLoader;	199 OwnPtr<FileReaderLoader> m_blobLoader;

199 BlobLoaderStatus m_blobLoaderStatus;	200 BlobLoaderStatus m_blobLoaderStatus;

200	201

	202 ScriptCallFrame m_callframeAtConnection;
	tyoshino (SeeGerritForStatus) 2013/04/19 14:18:10 use the same capitalization? m_callFrame... use the same capitalization? m_callFrame... yhirano 2013/04/22 05:18:29 Done. Show quoted text On 2013/04/19 14:18:10, tyoshino wrote: > use the same capitalization? > m_callFrame... Done.
201 WebSocketDeflateFramer m_deflateFramer;	203 WebSocketDeflateFramer m_deflateFramer;

202 };	204 };

203	205

204 } // namespace WebCore	206 } // namespace WebCore

205	207

206 #endif // MainThreadWebSocketChannel_h	208 #endif // MainThreadWebSocketChannel_h

OLD	NEW