Changeset 100173 in webkit

Timestamp:

Nov 14, 2011, 12:04:53 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] MediaStream API: Adding a sources() method to WebMediaStreamDescriptor
​https://bugs.webkit.org/show_bug.cgi?id=72116

Patch by Tommy Widenflycht <​tommyw@google.com> 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=):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebMediaStreamDescriptor.h (modified) (1 diff)
• public/WebMediaStreamSource.h (modified) (1 diff)
• src/WebMediaStreamDescriptor.cpp (modified) (2 diffs)
• src/WebMediaStreamSource.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-11-14  Tommy Widenflycht  <tommyw@google.com>
+
+        [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  <tommyw@google.com>
 

trunk/Source/WebKit/chromium/public/WebMediaStreamDescriptor.h

@@ -50 +50 @@
 
     WEBKIT_EXPORT WebString label() const;
+    WEBKIT_EXPORT void sources(WebVector<WebMediaStreamSource>&) const;
 
 #if WEBKIT_IMPLEMENTATION

trunk/Source/WebKit/chromium/public/WebMediaStreamSource.h

@@ -58 +58 @@
 #if WEBKIT_IMPLEMENTATION
     WebMediaStreamSource(const WTF::PassRefPtr<WebCore::MediaStreamSource>&);
+    WebMediaStreamSource& operator=(WebCore::MediaStreamSource*);
     operator WTF::PassRefPtr<WebCore::MediaStreamSource>() const;
     operator WebCore::MediaStreamSource*() const;

trunk/Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp

@@ -29 +29 @@
 #include "WebMediaStreamDescriptor.h"
 
+#include "MediaStreamComponent.h"
 #include "MediaStreamDescriptor.h"
 #include "MediaStreamSource.h"
@@ -52 +53 @@
 {
     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);
 }
 

trunk/Source/WebKit/chromium/src/WebMediaStreamSource.cpp

@@ -40 +40 @@
     : m_private(mediaStreamSource)
 {
+}
+
+WebMediaStreamSource& WebMediaStreamSource::operator=(WebCore::MediaStreamSource* mediaStreamSource)
+{
+    m_private.reset();
+    if (mediaStreamSource) {
+        mediaStreamSource->ref();
+        m_private = mediaStreamSource;
+    }
+    return *this;
 }