Title: [100173] trunk/Source/WebKit/chromium
- Revision
- 100173
- Author
- [email protected]
- Date
- 2011-11-14 12:04:53 -0800 (Mon, 14 Nov 2011)
Log Message
[chromium] MediaStream API: Adding a sources() method to WebMediaStreamDescriptor
https://bugs.webkit.org/show_bug.cgi?id=72116
Patch by Tommy Widenflycht <[email protected]> on 2011-11-14
Reviewed by Darin Fisher.
* public/WebMediaStreamDescriptor.h:
* public/WebMediaStreamSource.h:
* src/WebMediaStreamDescriptor.cpp:
(WebKit::WebMediaStreamDescriptor::sources):
* src/WebMediaStreamSource.cpp:
(WebKit::WebMediaStreamSource::operator=):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (100172 => 100173)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-14 19:46:46 UTC (rev 100172)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-14 20:04:53 UTC (rev 100173)
@@ -1,5 +1,19 @@
2011-11-14 Tommy Widenflycht <[email protected]>
+ [chromium] MediaStream API: Adding a sources() method to WebMediaStreamDescriptor
+ https://bugs.webkit.org/show_bug.cgi?id=72116
+
+ Reviewed by Darin Fisher.
+
+ * public/WebMediaStreamDescriptor.h:
+ * public/WebMediaStreamSource.h:
+ * src/WebMediaStreamDescriptor.cpp:
+ (WebKit::WebMediaStreamDescriptor::sources):
+ * src/WebMediaStreamSource.cpp:
+ (WebKit::WebMediaStreamSource::operator=):
+
+2011-11-14 Tommy Widenflycht <[email protected]>
+
[chromium] MediaStream API: Allow for null WebPeerConnectionHandler
https://bugs.webkit.org/show_bug.cgi?id=72114
Modified: trunk/Source/WebKit/chromium/public/WebMediaStreamDescriptor.h (100172 => 100173)
--- trunk/Source/WebKit/chromium/public/WebMediaStreamDescriptor.h 2011-11-14 19:46:46 UTC (rev 100172)
+++ trunk/Source/WebKit/chromium/public/WebMediaStreamDescriptor.h 2011-11-14 20:04:53 UTC (rev 100173)
@@ -49,6 +49,7 @@
bool isNull() const { return m_private.isNull(); }
WEBKIT_EXPORT WebString label() const;
+ WEBKIT_EXPORT void sources(WebVector<WebMediaStreamSource>&) const;
#if WEBKIT_IMPLEMENTATION
WebMediaStreamDescriptor(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&);
Modified: trunk/Source/WebKit/chromium/public/WebMediaStreamSource.h (100172 => 100173)
--- trunk/Source/WebKit/chromium/public/WebMediaStreamSource.h 2011-11-14 19:46:46 UTC (rev 100172)
+++ trunk/Source/WebKit/chromium/public/WebMediaStreamSource.h 2011-11-14 20:04:53 UTC (rev 100173)
@@ -57,6 +57,7 @@
#if WEBKIT_IMPLEMENTATION
WebMediaStreamSource(const WTF::PassRefPtr<WebCore::MediaStreamSource>&);
+ WebMediaStreamSource& operator=(WebCore::MediaStreamSource*);
operator WTF::PassRefPtr<WebCore::MediaStreamSource>() const;
operator WebCore::MediaStreamSource*() const;
#endif
Modified: trunk/Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp (100172 => 100173)
--- trunk/Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp 2011-11-14 19:46:46 UTC (rev 100172)
+++ trunk/Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp 2011-11-14 20:04:53 UTC (rev 100173)
@@ -28,6 +28,7 @@
#include "WebMediaStreamDescriptor.h"
+#include "MediaStreamComponent.h"
#include "MediaStreamDescriptor.h"
#include "MediaStreamSource.h"
#include "WebMediaStreamSource.h"
@@ -53,6 +54,15 @@
return m_private->label();
}
+void WebMediaStreamDescriptor::sources(WebVector<WebMediaStreamSource>& webSources) const
+{
+ size_t numberOfSources = m_private->numberOfComponents();
+ WebVector<WebMediaStreamSource> result(numberOfSources);
+ for (size_t i = 0; i < numberOfSources; ++i)
+ result[i] = m_private->component(i)->source();
+ webSources.swap(result);
+}
+
WebMediaStreamDescriptor& WebMediaStreamDescriptor::operator=(const PassRefPtr<WebCore::MediaStreamDescriptor>& mediaStreamDescriptor)
{
m_private = mediaStreamDescriptor;
Modified: trunk/Source/WebKit/chromium/src/WebMediaStreamSource.cpp (100172 => 100173)
--- trunk/Source/WebKit/chromium/src/WebMediaStreamSource.cpp 2011-11-14 19:46:46 UTC (rev 100172)
+++ trunk/Source/WebKit/chromium/src/WebMediaStreamSource.cpp 2011-11-14 20:04:53 UTC (rev 100173)
@@ -41,6 +41,16 @@
{
}
+WebMediaStreamSource& WebMediaStreamSource::operator=(WebCore::MediaStreamSource* mediaStreamSource)
+{
+ m_private.reset();
+ if (mediaStreamSource) {
+ mediaStreamSource->ref();
+ m_private = mediaStreamSource;
+ }
+ return *this;
+}
+
void WebMediaStreamSource::reset()
{
m_private.reset();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
