Changeset 91455 in webkit

Timestamp:

Jul 21, 2011 3:05:41 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

MediaStream API: Merging MediaStreamContainer and MediaStreamList
​https://bugs.webkit.org/show_bug.cgi?id=64794

Patch by Tommy Widenflycht <​tommyw@google.com> on 2011-07-21
Reviewed by Tony Gentilcore.

• GNUmakefile.list.am:
• dom/MediaStreamContainer.h: Removed.
• dom/MediaStreamList.cpp:

(WebCore::MediaStreamList::create):
(WebCore::MediaStreamList::MediaStreamList):
(WebCore::MediaStreamList::length):
(WebCore::MediaStreamList::item):
(WebCore::MediaStreamList::add):
(WebCore::MediaStreamList::remove):
(WebCore::MediaStreamList::contains):
(WebCore::MediaStreamList::get):

• dom/MediaStreamList.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• WebCore.pro (modified) (1 diff)
• WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• dom/MediaStreamContainer.h (deleted)
• dom/MediaStreamList.cpp (modified) (2 diffs)
• dom/MediaStreamList.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-21  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Merging MediaStreamContainer and MediaStreamList
+        https://bugs.webkit.org/show_bug.cgi?id=64794
+
+        Reviewed by Tony Gentilcore.
+
+        * GNUmakefile.list.am:
+        * dom/MediaStreamContainer.h: Removed.
+        * dom/MediaStreamList.cpp:
+        (WebCore::MediaStreamList::create):
+        (WebCore::MediaStreamList::MediaStreamList):
+        (WebCore::MediaStreamList::length):
+        (WebCore::MediaStreamList::item):
+        (WebCore::MediaStreamList::add):
+        (WebCore::MediaStreamList::remove):
+        (WebCore::MediaStreamList::contains):
+        (WebCore::MediaStreamList::get):
+        * dom/MediaStreamList.h:
+
 2011-07-20  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -1188 +1188 @@
         Source/WebCore/dom/MediaStream.cpp \
         Source/WebCore/dom/MediaStream.h \
-        Source/WebCore/dom/MediaStreamContainer.h \
         Source/WebCore/dom/MediaStreamList.cpp \
         Source/WebCore/dom/MediaStreamList.h \

trunk/Source/WebCore/WebCore.gypi

@@ -2520 +2520 @@
             'dom/MediaStream.cpp',
             'dom/MediaStream.h',
-            'dom/MediaStreamContainer.h',
             'dom/MediaStreamList.cpp',
             'dom/MediaStreamList.h',

trunk/Source/WebCore/WebCore.pro

@@ -3227 +3227 @@
         dom/LocalMediaStream.h \
         dom/MediaStream.h \
-        dom/MediaStreamContainer.h \
         dom/MediaStreamList.h \
         dom/MediaStreamTrack.h \

trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -45975 +45975 @@
                         </File>
                         <File
-                                RelativePath="..\dom\MediaStreamContainer.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\dom\MediaStreamList.cpp"
                                 >

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -4060 +4060 @@
                 ABDDFE7A0A5C6E7000A3E11D /* RenderMenuList.h in Headers */ = {isa = PBXBuildFile; fileRef = ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */; };
                 ADDF1AD71257CD9A0003A759 /* RenderSVGPath.h in Headers */ = {isa = PBXBuildFile; fileRef = ADDF1AD51257CD9A0003A759 /* RenderSVGPath.h */; };
-                B14353D4138EA8ED00D53276 /* MediaStreamContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = B14353D0138EA8ED00D53276 /* MediaStreamContainer.h */; };
                 B14353D5138EA8ED00D53276 /* MediaStreamList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B14353D1138EA8ED00D53276 /* MediaStreamList.cpp */; };
                 B14353D6138EA8ED00D53276 /* MediaStreamList.h in Headers */ = {isa = PBXBuildFile; fileRef = B14353D2138EA8ED00D53276 /* MediaStreamList.h */; };
@@ -10548 +10547 @@
                 ADDF1AD41257CD9A0003A759 /* RenderSVGPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGPath.cpp; sourceTree = "<group>"; };
                 ADDF1AD51257CD9A0003A759 /* RenderSVGPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGPath.h; sourceTree = "<group>"; };
-                B14353D0138EA8ED00D53276 /* MediaStreamContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamContainer.h; sourceTree = "<group>"; };
                 B14353D1138EA8ED00D53276 /* MediaStreamList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamList.cpp; sourceTree = "<group>"; };
                 B14353D2138EA8ED00D53276 /* MediaStreamList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamList.h; sourceTree = "<group>"; };
@@ -19776 +19774 @@
                                 B1E545751346291F0092A545 /* MediaStream.h */,
                                 B1E545761346291F0092A545 /* MediaStream.idl */,
-                                B14353D0138EA8ED00D53276 /* MediaStreamContainer.h */,
                                 B14353D1138EA8ED00D53276 /* MediaStreamList.cpp */,
                                 B14353D2138EA8ED00D53276 /* MediaStreamList.h */,
@@ -22257 +22254 @@
                                 B1E5457E1346291F0092A545 /* MediaStream.h in Headers */,
                                 B1E54594134629C10092A545 /* MediaStreamClient.h in Headers */,
-                                B14353D4138EA8ED00D53276 /* MediaStreamContainer.h in Headers */,
                                 B1E54598134629C10092A545 /* MediaStreamController.h in Headers */,
                                 B1E54596134629C10092A545 /* MediaStreamFrameController.h in Headers */,

trunk/Source/WebCore/dom/MediaStreamList.cpp

@@ -28 +28 @@
 #if ENABLE(MEDIA_STREAM)
 
-#include "MediaStreamContainer.h"
-
 namespace WebCore {
 
-PassRefPtr<MediaStreamList> MediaStreamList::create(PassRefPtr<MediaStreamContainer> streams)
+PassRefPtr<MediaStreamList> MediaStreamList::create()
 {
-    return adoptRef(new MediaStreamList(streams));
+    return adoptRef(new MediaStreamList());
 }
 
-MediaStreamList::MediaStreamList(PassRefPtr<MediaStreamContainer> streams)
-    : m_streams(streams)
+MediaStreamList::MediaStreamList()
 {
 }
@@ -48 +45 @@
 unsigned MediaStreamList::length() const
 {
-    return m_streams->length();
+    return m_streams.size();
 }
 
 PassRefPtr<MediaStream> MediaStreamList::item(unsigned index) const
 {
-    if (index < m_streams->length())
-        return m_streams->item(index);
+    HashMap<String, RefPtr<MediaStream> >::const_iterator i = m_streams.begin();
+    for (unsigned j = 0; i != m_streams.end(); ++i, ++j) {
+        if (j == index)
+            return i->second;
+    }
     return PassRefPtr<MediaStream>();
 }
+
+void MediaStreamList::add(PassRefPtr<MediaStream> stream)
+{
+    RefPtr<MediaStream> s = stream;
+    ASSERT(!contains(s));
+    m_streams.add(s->label(), s);
+}
+
+void MediaStreamList::remove(PassRefPtr<MediaStream> stream)
+{
+    RefPtr<MediaStream> s = stream;
+    ASSERT(contains(s));
+    m_streams.remove(s->label());
+}
+
+bool MediaStreamList::contains(PassRefPtr<MediaStream> stream) const
+{
+    RefPtr<MediaStream> s = stream;
+    return m_streams.contains(s->label());
+}
+
+bool MediaStreamList::contains(const String& label) const
+{
+    return m_streams.contains(label);
+}
+
+PassRefPtr<MediaStream> MediaStreamList::get(const String& label) const
+{
+    return m_streams.get(label);
+}
+
 
 } // namespace WebCore

trunk/Source/WebCore/dom/MediaStreamList.h

@@ -28 +28 @@
 #if ENABLE(MEDIA_STREAM)
 
-#include <wtf/Forward.h>
+#include "MediaStream.h"
+#include <wtf/HashMap.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -35 +36 @@
 namespace WebCore {
 
-class MediaStream;
-class MediaStreamContainer;
-
 class MediaStreamList : public RefCounted<MediaStreamList> {
 public:
-    static PassRefPtr<MediaStreamList> create(PassRefPtr<MediaStreamContainer> streams);
+    static PassRefPtr<MediaStreamList> create();
     virtual ~MediaStreamList();
 
     // DOM methods & attributes for MediaStreamList
-    virtual unsigned length() const;
-    virtual PassRefPtr<MediaStream> item(unsigned index) const;
+    unsigned length() const;
+    PassRefPtr<MediaStream> item(unsigned index) const;
+
+    // List manipulation
+    void add(PassRefPtr<MediaStream>);
+    void remove(PassRefPtr<MediaStream>);
+    bool contains(PassRefPtr<MediaStream>) const;
+    bool contains(const String& label) const;
+    PassRefPtr<MediaStream> get(const String& label) const;
 
 private:
-    MediaStreamList(PassRefPtr<MediaStreamContainer> streams);
+    MediaStreamList();
 
-    RefPtr<MediaStreamContainer> m_streams;
+    HashMap<String, RefPtr<MediaStream> > m_streams;
 };