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

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

Issue 2016123002: Remove ScriptCallStack. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2006893004
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
« no previous file with comments | « third_party/WebKit/Source/web/WebLocalFrameImpl.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 122 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, nullptr); 143 m_private->fail(reason, ErrorMessageLevel, SourceLocation::create(String(), 0, 0, 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
« no previous file with comments | « third_party/WebKit/Source/web/WebLocalFrameImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698