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

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

Issue 711763002: bindings: Transition from ArrayBuffer to DOMArrayBuffer, part 2 (2nd round) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixes Win x64 build. Created 6 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « Source/modules/websockets/WorkerWebSocketChannel.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
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 #include "config.h" 31 #include "config.h"
32 #include "web/WebSocketImpl.h" 32 #include "web/WebSocketImpl.h"
33 33
34 #include "core/dom/DOMArrayBuffer.h"
34 #include "core/dom/Document.h" 35 #include "core/dom/Document.h"
35 #include "core/frame/ConsoleTypes.h" 36 #include "core/frame/ConsoleTypes.h"
36 #include "modules/websockets/DocumentWebSocketChannel.h" 37 #include "modules/websockets/DocumentWebSocketChannel.h"
37 #include "modules/websockets/WebSocketChannel.h" 38 #include "modules/websockets/WebSocketChannel.h"
38 #include "public/platform/WebArrayBuffer.h" 39 #include "public/platform/WebArrayBuffer.h"
39 #include "public/platform/WebString.h" 40 #include "public/platform/WebString.h"
40 #include "public/platform/WebURL.h" 41 #include "public/platform/WebURL.h"
41 #include "public/web/WebDocument.h" 42 #include "public/web/WebDocument.h"
42 #include "web/WebSocketChannelClientProxy.h" 43 #include "web/WebSocketChannelClientProxy.h"
43 #include "wtf/ArrayBuffer.h"
44 #include "wtf/text/CString.h" 44 #include "wtf/text/CString.h"
45 #include "wtf/text/WTFString.h" 45 #include "wtf/text/WTFString.h"
46 46
47 namespace blink { 47 namespace blink {
48 48
49 WebSocketImpl::WebSocketImpl(const WebDocument& document, WebSocketClient* clien t) 49 WebSocketImpl::WebSocketImpl(const WebDocument& document, WebSocketClient* clien t)
50 : m_client(client) 50 : m_client(client)
51 , m_channelProxy(WebSocketChannelClientProxy::create(this)) 51 , m_channelProxy(WebSocketChannelClientProxy::create(this))
52 , m_binaryType(BinaryTypeBlob) 52 , m_binaryType(BinaryTypeBlob)
53 , m_isClosingOrClosed(false) 53 , m_isClosingOrClosed(false)
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 m_bufferedAmount += size; 114 m_bufferedAmount += size;
115 if (m_isClosingOrClosed) 115 if (m_isClosingOrClosed)
116 m_bufferedAmountAfterClose += size; 116 m_bufferedAmountAfterClose += size;
117 117
118 // FIXME: Deprecate this call. 118 // FIXME: Deprecate this call.
119 m_client->didUpdateBufferedAmount(m_bufferedAmount); 119 m_client->didUpdateBufferedAmount(m_bufferedAmount);
120 120
121 if (m_isClosingOrClosed) 121 if (m_isClosingOrClosed)
122 return true; 122 return true;
123 123
124 m_private->send(*PassRefPtr<ArrayBuffer>(webArrayBuffer), 0, webArrayBuffer. byteLength()); 124 RefPtr<DOMArrayBuffer> arrayBuffer = DOMArrayBuffer::create(webArrayBuffer);
125 m_private->send(*arrayBuffer, 0, arrayBuffer->byteLength());
125 return true; 126 return true;
126 } 127 }
127 128
128 unsigned long WebSocketImpl::bufferedAmount() const 129 unsigned long WebSocketImpl::bufferedAmount() const
129 { 130 {
130 return m_bufferedAmount; 131 return m_bufferedAmount;
131 } 132 }
132 133
133 void WebSocketImpl::close(int code, const WebString& reason) 134 void WebSocketImpl::close(int code, const WebString& reason)
134 { 135 {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 void WebSocketImpl::didClose(WebSocketChannelClient::ClosingHandshakeCompletionS tatus status, unsigned short code, const String& reason) 197 void WebSocketImpl::didClose(WebSocketChannelClient::ClosingHandshakeCompletionS tatus status, unsigned short code, const String& reason)
197 { 198 {
198 m_isClosingOrClosed = true; 199 m_isClosingOrClosed = true;
199 m_client->didClose(static_cast<WebSocketClient::ClosingHandshakeCompletionSt atus>(status), code, WebString(reason)); 200 m_client->didClose(static_cast<WebSocketClient::ClosingHandshakeCompletionSt atus>(status), code, WebString(reason));
200 201
201 // FIXME: Deprecate this call. 202 // FIXME: Deprecate this call.
202 m_client->didClose(m_bufferedAmount - m_bufferedAmountAfterClose, static_cas t<WebSocketClient::ClosingHandshakeCompletionStatus>(status), code, WebString(re ason)); 203 m_client->didClose(m_bufferedAmount - m_bufferedAmountAfterClose, static_cas t<WebSocketClient::ClosingHandshakeCompletionStatus>(status), code, WebString(re ason));
203 } 204 }
204 205
205 } // namespace blink 206 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/websockets/WorkerWebSocketChannel.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698