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

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

Issue 10982093: Merge 129397 - MediaStream API: Fix the incorrectly spelled RTCPeerConnection::onnegotiationneeded … (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/
Patch Set: Created 8 years, 2 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) 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 return; 386 return;
387 } 387 }
388 388
389 changeIceState(IceStateClosed); 389 changeIceState(IceStateClosed);
390 changeReadyState(ReadyStateClosed); 390 changeReadyState(ReadyStateClosed);
391 stop(); 391 stop();
392 } 392 }
393 393
394 void RTCPeerConnection::negotiationNeeded() 394 void RTCPeerConnection::negotiationNeeded()
395 { 395 {
396 dispatchEvent(Event::create(eventNames().negotationneededEvent, false, false )); 396 dispatchEvent(Event::create(eventNames().negotiationneededEvent, false, fals e));
397 } 397 }
398 398
399 void RTCPeerConnection::didGenerateIceCandidate(PassRefPtr<RTCIceCandidateDescri ptor> iceCandidateDescriptor) 399 void RTCPeerConnection::didGenerateIceCandidate(PassRefPtr<RTCIceCandidateDescri ptor> iceCandidateDescriptor)
400 { 400 {
401 ASSERT(scriptExecutionContext()->isContextThread()); 401 ASSERT(scriptExecutionContext()->isContextThread());
402 if (!iceCandidateDescriptor) 402 if (!iceCandidateDescriptor)
403 dispatchEvent(RTCIceCandidateEvent::create(false, false, 0)); 403 dispatchEvent(RTCIceCandidateEvent::create(false, false, 0));
404 else { 404 else {
405 RefPtr<RTCIceCandidate> iceCandidate = RTCIceCandidate::create(iceCandid ateDescriptor); 405 RefPtr<RTCIceCandidate> iceCandidate = RTCIceCandidate::create(iceCandid ateDescriptor);
406 dispatchEvent(RTCIceCandidateEvent::create(false, false, iceCandidate.re lease())); 406 dispatchEvent(RTCIceCandidateEvent::create(false, false, iceCandidate.re lease()));
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 if (iceState == m_iceState || m_readyState == ReadyStateClosed) 509 if (iceState == m_iceState || m_readyState == ReadyStateClosed)
510 return; 510 return;
511 511
512 m_iceState = iceState; 512 m_iceState = iceState;
513 dispatchEvent(Event::create(eventNames().icechangeEvent, false, false)); 513 dispatchEvent(Event::create(eventNames().icechangeEvent, false, false));
514 } 514 }
515 515
516 } // namespace WebCore 516 } // namespace WebCore
517 517
518 #endif // ENABLE(MEDIA_STREAM) 518 #endif // ENABLE(MEDIA_STREAM)
OLDNEW
« no previous file with comments | « Source/WebCore/Modules/mediastream/RTCPeerConnection.h ('k') | Source/WebCore/Modules/mediastream/RTCPeerConnection.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698