- Revision
- 116321
- Author
- [email protected]
- Date
- 2012-05-07 10:56:30 -0700 (Mon, 07 May 2012)
Log Message
MediaStream API: Rename MediaStreamCenter::didConstructMediaStream
https://bugs.webkit.org/show_bug.cgi?id=85796
Reviewed by Adam Barth.
Source/Platform:
Renamed WebMediaStreamCenter::didConstructMediaStream to didCreateMediaStream,
and change so that it is only called for MediaStreams created from JS.
Also send out the WebMediaStreamDescriptor non-const instead.
* chromium/public/WebMediaStreamCenter.h:
(WebKit::WebMediaStreamCenter::didCreateMediaStream):
(WebMediaStreamCenter):
(WebKit::WebMediaStreamCenter::didConstructMediaStream):
Source/WebCore:
Renamed MediaStreamCenter::didConstructMediaStream to didCreateMediaStream,
and change so that it is only called for MediaStreams created from JS.
Not really testable.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::create):
* platform/mediastream/MediaStreamCenter.h:
(MediaStreamCenter):
* platform/mediastream/chromium/MediaStreamCenterChromium.cpp:
(WebCore::MediaStreamCenterChromium::didCreateMediaStream):
* platform/mediastream/chromium/MediaStreamCenterChromium.h:
(MediaStreamCenterChromium):
* platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp:
(WebCore::MediaStreamCenterGStreamer::didCreateMediaStream):
* platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h:
(MediaStreamCenterGStreamer):
Modified Paths
Diff
Modified: trunk/Source/Platform/ChangeLog (116320 => 116321)
--- trunk/Source/Platform/ChangeLog 2012-05-07 17:42:07 UTC (rev 116320)
+++ trunk/Source/Platform/ChangeLog 2012-05-07 17:56:30 UTC (rev 116321)
@@ -1,5 +1,21 @@
2012-05-07 Tommy Widenflycht <[email protected]>
+ MediaStream API: Rename MediaStreamCenter::didConstructMediaStream
+ https://bugs.webkit.org/show_bug.cgi?id=85796
+
+ Reviewed by Adam Barth.
+
+ Renamed WebMediaStreamCenter::didConstructMediaStream to didCreateMediaStream,
+ and change so that it is only called for MediaStreams created from JS.
+ Also send out the WebMediaStreamDescriptor non-const instead.
+
+ * chromium/public/WebMediaStreamCenter.h:
+ (WebKit::WebMediaStreamCenter::didCreateMediaStream):
+ (WebMediaStreamCenter):
+ (WebKit::WebMediaStreamCenter::didConstructMediaStream):
+
+2012-05-07 Tommy Widenflycht <[email protected]>
+
MediaStream API: Allow UserMediaRequest::succeed to take an MediaStreamDescriptor
https://bugs.webkit.org/show_bug.cgi?id=85798
Modified: trunk/Source/Platform/chromium/public/WebMediaStreamCenter.h (116320 => 116321)
--- trunk/Source/Platform/chromium/public/WebMediaStreamCenter.h 2012-05-07 17:42:07 UTC (rev 116320)
+++ trunk/Source/Platform/chromium/public/WebMediaStreamCenter.h 2012-05-07 17:56:30 UTC (rev 116321)
@@ -48,11 +48,13 @@
virtual void didEnableMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent&) = 0;
virtual void didDisableMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent&) = 0;
virtual void didStopLocalMediaStream(const WebMediaStreamDescriptor&) = 0;
- virtual void didConstructMediaStream(const WebMediaStreamDescriptor&) = 0;
+ virtual void didCreateMediaStream(WebMediaStreamDescriptor&) { }
- // FIXME: Make pure virtual after implementation.
- virtual WebString constructSDP(const WebICECandidateDescriptor&) { return WebString(); }
- virtual WebString constructSDP(const WebSessionDescriptionDescriptor&) { return WebString(); }
+ // DEPRECATED
+ virtual void didConstructMediaStream(const WebMediaStreamDescriptor&) { }
+
+ virtual WebString constructSDP(const WebICECandidateDescriptor&) = 0;
+ virtual WebString constructSDP(const WebSessionDescriptionDescriptor&) = 0;
};
} // namespace WebKit
Modified: trunk/Source/WebCore/ChangeLog (116320 => 116321)
--- trunk/Source/WebCore/ChangeLog 2012-05-07 17:42:07 UTC (rev 116320)
+++ trunk/Source/WebCore/ChangeLog 2012-05-07 17:56:30 UTC (rev 116321)
@@ -1,3 +1,28 @@
+2012-05-07 Tommy Widenflycht <[email protected]>
+
+ MediaStream API: Rename MediaStreamCenter::didConstructMediaStream
+ https://bugs.webkit.org/show_bug.cgi?id=85796
+
+ Reviewed by Adam Barth.
+
+ Renamed MediaStreamCenter::didConstructMediaStream to didCreateMediaStream,
+ and change so that it is only called for MediaStreams created from JS.
+
+ Not really testable.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::create):
+ * platform/mediastream/MediaStreamCenter.h:
+ (MediaStreamCenter):
+ * platform/mediastream/chromium/MediaStreamCenterChromium.cpp:
+ (WebCore::MediaStreamCenterChromium::didCreateMediaStream):
+ * platform/mediastream/chromium/MediaStreamCenterChromium.h:
+ (MediaStreamCenterChromium):
+ * platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp:
+ (WebCore::MediaStreamCenterGStreamer::didCreateMediaStream):
+ * platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h:
+ (MediaStreamCenterGStreamer):
+
2012-05-07 Nat Duca <[email protected]>
Unreviewed, rolling out r115525.
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (116320 => 116321)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2012-05-07 17:42:07 UTC (rev 116320)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2012-05-07 17:56:30 UTC (rev 116321)
@@ -74,7 +74,7 @@
return 0;
RefPtr<MediaStreamDescriptor> descriptor = MediaStreamDescriptor::create(createCanonicalUUIDString(), audioSources, videoSources);
- MediaStreamCenter::instance().didConstructMediaStream(descriptor.get());
+ MediaStreamCenter::instance().didCreateMediaStream(descriptor.get());
return adoptRef(new MediaStream(context, descriptor.release()));
}
Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h (116320 => 116321)
--- trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h 2012-05-07 17:42:07 UTC (rev 116320)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h 2012-05-07 17:56:30 UTC (rev 116321)
@@ -58,7 +58,7 @@
// Calls from the DOM objects to notify the platform
virtual void didSetMediaStreamTrackEnabled(MediaStreamDescriptor*, MediaStreamComponent*) = 0;
virtual void didStopLocalMediaStream(MediaStreamDescriptor*) = 0;
- virtual void didConstructMediaStream(MediaStreamDescriptor*) = 0;
+ virtual void didCreateMediaStream(MediaStreamDescriptor*) = 0;
virtual String constructSDP(IceCandidateDescriptor*) = 0;
virtual String constructSDP(SessionDescriptionDescriptor*) = 0;
Modified: trunk/Source/WebCore/platform/mediastream/chromium/MediaStreamCenterChromium.cpp (116320 => 116321)
--- trunk/Source/WebCore/platform/mediastream/chromium/MediaStreamCenterChromium.cpp 2012-05-07 17:42:07 UTC (rev 116320)
+++ trunk/Source/WebCore/platform/mediastream/chromium/MediaStreamCenterChromium.cpp 2012-05-07 17:56:30 UTC (rev 116321)
@@ -89,10 +89,15 @@
m_private->didStopLocalMediaStream(stream);
}
-void MediaStreamCenterChromium::didConstructMediaStream(MediaStreamDescriptor* stream)
+void MediaStreamCenterChromium::didCreateMediaStream(MediaStreamDescriptor* stream)
{
- if (m_private)
+ if (m_private) {
+ // FIXME: Remove when Chromium have switched to the new API.
m_private->didConstructMediaStream(stream);
+
+ WebKit::WebMediaStreamDescriptor webStream(stream);
+ m_private->didCreateMediaStream(webStream);
+ }
}
String MediaStreamCenterChromium::constructSDP(IceCandidateDescriptor* iceCandidate)
Modified: trunk/Source/WebCore/platform/mediastream/chromium/MediaStreamCenterChromium.h (116320 => 116321)
--- trunk/Source/WebCore/platform/mediastream/chromium/MediaStreamCenterChromium.h 2012-05-07 17:42:07 UTC (rev 116320)
+++ trunk/Source/WebCore/platform/mediastream/chromium/MediaStreamCenterChromium.h 2012-05-07 17:56:30 UTC (rev 116321)
@@ -62,7 +62,7 @@
virtual void queryMediaStreamSources(PassRefPtr<MediaStreamSourcesQueryClient>) OVERRIDE;
virtual void didSetMediaStreamTrackEnabled(MediaStreamDescriptor*, MediaStreamComponent*) OVERRIDE;
virtual void didStopLocalMediaStream(MediaStreamDescriptor*) OVERRIDE;
- virtual void didConstructMediaStream(MediaStreamDescriptor*) OVERRIDE;
+ virtual void didCreateMediaStream(MediaStreamDescriptor*) OVERRIDE;
virtual String constructSDP(IceCandidateDescriptor*) OVERRIDE;
virtual String constructSDP(SessionDescriptionDescriptor*) OVERRIDE;
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp (116320 => 116321)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp 2012-05-07 17:42:07 UTC (rev 116320)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp 2012-05-07 17:56:30 UTC (rev 116321)
@@ -72,7 +72,7 @@
{
}
-void MediaStreamCenterGStreamer::didConstructMediaStream(MediaStreamDescriptor*)
+void MediaStreamCenterGStreamer::didCreateMediaStream(MediaStreamDescriptor*)
{
}
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h (116320 => 116321)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h 2012-05-07 17:42:07 UTC (rev 116320)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h 2012-05-07 17:56:30 UTC (rev 116321)
@@ -56,7 +56,7 @@
virtual void queryMediaStreamSources(PassRefPtr<MediaStreamSourcesQueryClient>) OVERRIDE;
virtual void didSetMediaStreamTrackEnabled(MediaStreamDescriptor*, MediaStreamComponent*) OVERRIDE;
virtual void didStopLocalMediaStream(MediaStreamDescriptor*) OVERRIDE;
- virtual void didConstructMediaStream(MediaStreamDescriptor*) OVERRIDE;
+ virtual void didCreateMediaStream(MediaStreamDescriptor*) OVERRIDE;
virtual String constructSDP(IceCandidateDescriptor*) OVERRIDE;
virtual String constructSDP(SessionDescriptionDescriptor*) OVERRIDE;
};
