Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/modules/mediastream/RTCPeerConnection.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 360 matching lines @@
 
     if (m_localStreams.contains(stream))
         return;
 
     RefPtr<MediaConstraints> constraints = MediaConstraintsImpl::create(mediaConstraints, ec);
     if (ec)
         return;
 
     m_localStreams.append(stream);
 
-    bool valid = m_peerHandler->addStream(stream->webStream(), constraints);
+    bool valid = m_peerHandler->addStream(stream->descriptor(), constraints);
     if (!valid)
         ec = SYNTAX_ERR;
 }
 
 void RTCPeerConnection::removeStream(PassRefPtr<MediaStream> prpStream, ExceptionCode& ec)
 {
     if (m_signalingState == SignalingStateClosed) {
         ec = INVALID_STATE_ERR;
         return;
     }
 
     if (!prpStream) {
         ec = TYPE_MISMATCH_ERR;
         return;
     }
 
     RefPtr<MediaStream> stream = prpStream;
 
     size_t pos = m_localStreams.find(stream);
     if (pos == notFound)
         return;
 
     m_localStreams.remove(pos);
 
-    m_peerHandler->removeStream(stream->webStream());
+    m_peerHandler->removeStream(stream->descriptor());
 }
 
 MediaStreamVector RTCPeerConnection::getLocalStreams() const
 {
     return m_localStreams;
 }
 
 MediaStreamVector RTCPeerConnection::getRemoteStreams() const
 {
     return m_remoteStreams;
@@ skipping 126 matching lines @@
     ASSERT(scriptExecutionContext()->isContextThread());
     changeIceGatheringState(newState);
 }
 
 void RTCPeerConnection::didChangeIceConnectionState(IceConnectionState newState)
 {
     ASSERT(scriptExecutionContext()->isContextThread());
     changeIceConnectionState(newState);
 }
 
-void RTCPeerConnection::didAddRemoteStream(WebKit::WebMediaStream webStream)
+void RTCPeerConnection::didAddRemoteStream(PassRefPtr<MediaStreamDescriptor> streamDescriptor)
 {
     ASSERT(scriptExecutionContext()->isContextThread());
 
     if (m_signalingState == SignalingStateClosed)
         return;
 
-    RefPtr<MediaStream> stream = MediaStream::create(scriptExecutionContext(), webStream);
+    RefPtr<MediaStream> stream = MediaStream::create(scriptExecutionContext(), streamDescriptor);
     m_remoteStreams.append(stream);
 
     scheduleDispatchEvent(MediaStreamEvent::create(eventNames().addstreamEvent, false, false, stream.release()));
 }
 
-void RTCPeerConnection::didRemoveRemoteStream(WebKit::WebMediaStream webStream)
+void RTCPeerConnection::didRemoveRemoteStream(MediaStreamDescriptor* streamDescriptor)
 {
     ASSERT(scriptExecutionContext()->isContextThread());
+    ASSERT(streamDescriptor->client());
 
-    RefPtr<MediaStream> stream = static_cast<MediaStream*>(webStream.client());
-    webStream.streamEnded();
+    RefPtr<MediaStream> stream = static_cast<MediaStream*>(streamDescriptor->client());
+    stream->streamEnded();
 
     if (m_signalingState == SignalingStateClosed)
         return;
 
     size_t pos = m_remoteStreams.find(stream);
     ASSERT(pos != notFound);
     m_remoteStreams.remove(pos);
 
     scheduleDispatchEvent(MediaStreamEvent::create(eventNames().removestreamEvent, false, false, stream.release()));
 }
@@ skipping 83 matching lines @@
     events.swap(m_scheduledEvents);
 
     Vector<RefPtr<Event> >::iterator it = events.begin();
     for (; it != events.end(); ++it)
         dispatchEvent((*it).release());
 
     events.clear();
 }
 
 } // namespace WebCore