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

Side by Side Diff: third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp

Issue 2578193004: Remove ActiveScriptWrappableBase::m_scriptWrappable (Closed)
Patch Set: temp Created 4 years 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/modules/webmidi/MIDIPort.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 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 static void setInvalidStateErrorForSendMethod(ExceptionState& exceptionState) { 211 static void setInvalidStateErrorForSendMethod(ExceptionState& exceptionState) {
212 exceptionState.throwDOMException(InvalidStateError, 212 exceptionState.throwDOMException(InvalidStateError,
213 "Still in CONNECTING state."); 213 "Still in CONNECTING state.");
214 } 214 }
215 215
216 const char* DOMWebSocket::subprotocolSeperator() { 216 const char* DOMWebSocket::subprotocolSeperator() {
217 return ", "; 217 return ", ";
218 } 218 }
219 219
220 DOMWebSocket::DOMWebSocket(ExecutionContext* context) 220 DOMWebSocket::DOMWebSocket(ExecutionContext* context)
221 : ActiveScriptWrappable<DOMWebSocket>(this), 221 : SuspendableObject(context),
222 SuspendableObject(context),
223 m_state(kConnecting), 222 m_state(kConnecting),
224 m_bufferedAmount(0), 223 m_bufferedAmount(0),
225 m_consumedBufferedAmount(0), 224 m_consumedBufferedAmount(0),
226 m_bufferedAmountAfterClose(0), 225 m_bufferedAmountAfterClose(0),
227 m_binaryType(BinaryTypeBlob), 226 m_binaryType(BinaryTypeBlob),
228 m_binaryTypeChangesAfterOpen(0), 227 m_binaryTypeChangesAfterOpen(0),
229 m_subprotocol(""), 228 m_subprotocol(""),
230 m_extensions(""), 229 m_extensions(""),
231 m_eventQueue(EventQueue::create(this)), 230 m_eventQueue(EventQueue::create(this)),
232 m_bufferedAmountConsumeTimer( 231 m_bufferedAmountConsumeTimer(
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 859
861 DEFINE_TRACE(DOMWebSocket) { 860 DEFINE_TRACE(DOMWebSocket) {
862 visitor->trace(m_channel); 861 visitor->trace(m_channel);
863 visitor->trace(m_eventQueue); 862 visitor->trace(m_eventQueue);
864 WebSocketChannelClient::trace(visitor); 863 WebSocketChannelClient::trace(visitor);
865 EventTargetWithInlineData::trace(visitor); 864 EventTargetWithInlineData::trace(visitor);
866 SuspendableObject::trace(visitor); 865 SuspendableObject::trace(visitor);
867 } 866 }
868 867
869 } // namespace blink 868 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/webmidi/MIDIPort.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698