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

Side by Side Diff: third_party/WebKit/Source/web/WebPepperSocketImpl.cpp

Issue 2004243002: Migrate websockets from url+lineNumber to SourceLocation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@more-source-location-1
Patch Set: rebased Created 4 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 WebPepperSocketImpl::WebPepperSocketImpl(const WebDocument& document, WebPepperS ocketClient* client) 48 WebPepperSocketImpl::WebPepperSocketImpl(const WebDocument& document, WebPepperS ocketClient* client)
49 : m_client(client) 49 : m_client(client)
50 , m_channelProxy(WebPepperSocketChannelClientProxy::create(this)) 50 , m_channelProxy(WebPepperSocketChannelClientProxy::create(this))
51 , m_binaryType(BinaryTypeBlob) 51 , m_binaryType(BinaryTypeBlob)
52 , m_isClosingOrClosed(false) 52 , m_isClosingOrClosed(false)
53 , m_bufferedAmount(0) 53 , m_bufferedAmount(0)
54 , m_bufferedAmountAfterClose(0) 54 , m_bufferedAmountAfterClose(0)
55 { 55 {
56 Document* coreDocument = document; 56 Document* coreDocument = document;
57 m_private = DocumentWebSocketChannel::create(coreDocument, m_channelProxy.ge t()); 57 m_private = DocumentWebSocketChannel::create(coreDocument, m_channelProxy.ge t(), SourceLocation::capture());
58 } 58 }
59 59
60 WebPepperSocketImpl::~WebPepperSocketImpl() 60 WebPepperSocketImpl::~WebPepperSocketImpl()
61 { 61 {
62 m_private->disconnect(); 62 m_private->disconnect();
63 } 63 }
64 64
65 WebPepperSocket::BinaryType WebPepperSocketImpl::binaryType() const 65 WebPepperSocket::BinaryType WebPepperSocketImpl::binaryType() const
66 { 66 {
67 return m_binaryType; 67 return m_binaryType;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 } 133 }
134 134
135 void WebPepperSocketImpl::close(int code, const WebString& reason) 135 void WebPepperSocketImpl::close(int code, const WebString& reason)
136 { 136 {
137 m_isClosingOrClosed = true; 137 m_isClosingOrClosed = true;
138 m_private->close(code, reason); 138 m_private->close(code, reason);
139 } 139 }
140 140
141 void WebPepperSocketImpl::fail(const WebString& reason) 141 void WebPepperSocketImpl::fail(const WebString& reason)
142 { 142 {
143 m_private->fail(reason, ErrorMessageLevel, String(), 0); 143 m_private->fail(reason, ErrorMessageLevel, nullptr);
144 } 144 }
145 145
146 void WebPepperSocketImpl::disconnect() 146 void WebPepperSocketImpl::disconnect()
147 { 147 {
148 m_private->disconnect(); 148 m_private->disconnect();
149 m_client = nullptr; 149 m_client = nullptr;
150 } 150 }
151 151
152 void WebPepperSocketImpl::didConnect(const String& subprotocol, const String& ex tensions) 152 void WebPepperSocketImpl::didConnect(const String& subprotocol, const String& ex tensions)
153 { 153 {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 void WebPepperSocketImpl::didClose(WebSocketChannelClient::ClosingHandshakeCompl etionStatus status, unsigned short code, const String& reason) 198 void WebPepperSocketImpl::didClose(WebSocketChannelClient::ClosingHandshakeCompl etionStatus status, unsigned short code, const String& reason)
199 { 199 {
200 m_isClosingOrClosed = true; 200 m_isClosingOrClosed = true;
201 m_client->didClose(static_cast<WebPepperSocketClient::ClosingHandshakeComple tionStatus>(status), code, WebString(reason)); 201 m_client->didClose(static_cast<WebPepperSocketClient::ClosingHandshakeComple tionStatus>(status), code, WebString(reason));
202 202
203 // FIXME: Deprecate this call. 203 // FIXME: Deprecate this call.
204 m_client->didClose(m_bufferedAmount - m_bufferedAmountAfterClose, static_cas t<WebPepperSocketClient::ClosingHandshakeCompletionStatus>(status), code, WebStr ing(reason)); 204 m_client->didClose(m_bufferedAmount - m_bufferedAmountAfterClose, static_cas t<WebPepperSocketClient::ClosingHandshakeCompletionStatus>(status), code, WebStr ing(reason));
205 } 205 }
206 206
207 } // namespace blink 207 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698