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

Side by Side Diff: Source/WebCore/Modules/mediastream/RTCDataChannel.cpp

Issue 12301006: Merge 142887 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 10 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 | « no previous file | Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp » ('j') | 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 } 236 }
237 237
238 ScriptExecutionContext* RTCDataChannel::scriptExecutionContext() const 238 ScriptExecutionContext* RTCDataChannel::scriptExecutionContext() const
239 { 239 {
240 return m_scriptExecutionContext; 240 return m_scriptExecutionContext;
241 } 241 }
242 242
243 void RTCDataChannel::stop() 243 void RTCDataChannel::stop()
244 { 244 {
245 m_stopped = true; 245 m_stopped = true;
246 m_readyState = ReadyStateClosed;
246 m_handler->setClient(0); 247 m_handler->setClient(0);
247 m_scriptExecutionContext = 0; 248 m_scriptExecutionContext = 0;
248 } 249 }
249 250
250 EventTargetData* RTCDataChannel::eventTargetData() 251 EventTargetData* RTCDataChannel::eventTargetData()
251 { 252 {
252 return &m_eventTargetData; 253 return &m_eventTargetData;
253 } 254 }
254 255
255 EventTargetData* RTCDataChannel::ensureEventTargetData() 256 EventTargetData* RTCDataChannel::ensureEventTargetData()
(...skipping 20 matching lines...) Expand all
276 Vector<RefPtr<Event> >::iterator it = events.begin(); 277 Vector<RefPtr<Event> >::iterator it = events.begin();
277 for (; it != events.end(); ++it) 278 for (; it != events.end(); ++it)
278 dispatchEvent((*it).release()); 279 dispatchEvent((*it).release());
279 280
280 events.clear(); 281 events.clear();
281 } 282 }
282 283
283 } // namespace WebCore 284 } // namespace WebCore
284 285
285 #endif // ENABLE(MEDIA_STREAM) 286 #endif // ENABLE(MEDIA_STREAM)
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698