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

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: Fix a test expectation 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
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 14 matching lines...) Expand all
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 "core/fileapi/FileReaderLoaderClient.h" 34 #include "core/fileapi/FileReaderLoaderClient.h"
35 #include "core/inspector/ScriptCallFrame.h"
35 #include "core/platform/Timer.h" 36 #include "core/platform/Timer.h"
36 #include "core/platform/network/SocketStreamHandleClient.h" 37 #include "core/platform/network/SocketStreamHandleClient.h"
37 #include "modules/websockets/WebSocketChannel.h" 38 #include "modules/websockets/WebSocketChannel.h"
38 #include "modules/websockets/WebSocketDeflateFramer.h" 39 #include "modules/websockets/WebSocketDeflateFramer.h"
39 #include "modules/websockets/WebSocketFrame.h" 40 #include "modules/websockets/WebSocketFrame.h"
40 #include "modules/websockets/WebSocketHandshake.h" 41 #include "modules/websockets/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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 unsigned short m_closeEventCode; 191 unsigned short m_closeEventCode;
191 String m_closeEventReason; 192 String m_closeEventReason;
192 193
193 Deque<OwnPtr<QueuedFrame> > m_outgoingFrameQueue; 194 Deque<OwnPtr<QueuedFrame> > m_outgoingFrameQueue;
194 OutgoingFrameQueueStatus m_outgoingFrameQueueStatus; 195 OutgoingFrameQueueStatus m_outgoingFrameQueueStatus;
195 196
196 // FIXME: Load two or more Blobs simultaneously for better performance. 197 // FIXME: Load two or more Blobs simultaneously for better performance.
197 OwnPtr<FileReaderLoader> m_blobLoader; 198 OwnPtr<FileReaderLoader> m_blobLoader;
198 BlobLoaderStatus m_blobLoaderStatus; 199 BlobLoaderStatus m_blobLoaderStatus;
199 200
201 ScriptCallFrame m_callFrameAtConnection;
200 WebSocketDeflateFramer m_deflateFramer; 202 WebSocketDeflateFramer m_deflateFramer;
201 }; 203 };
202 204
203 } // namespace WebCore 205 } // namespace WebCore
204 206
205 #endif // MainThreadWebSocketChannel_h 207 #endif // MainThreadWebSocketChannel_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698