Merge 142773

Source/WebCore/platform/mediastream/MediaStreamComponent.h

 /*
  * Copyright (C) 2011 Ericsson AB. 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 26 matching lines @@
 #include "UUID.h"
 
 namespace WebCore {
 
 class MediaStreamDescriptor;
 
 class MediaStreamComponent : public RefCounted<MediaStreamComponent> {
 public:
     static PassRefPtr<MediaStreamComponent> create(PassRefPtr<MediaStreamSource> source)
     {
-        return adoptRef(new MediaStreamComponent(0, source));
+        return adoptRef(new MediaStreamComponent(createCanonicalUUIDString(), 0, source));
+    }
+
+    static PassRefPtr<MediaStreamComponent> create(const String& id, PassRefPtr<MediaStreamSource> source)
+    {
+        return adoptRef(new MediaStreamComponent(id, 0, source));
     }
 
     static PassRefPtr<MediaStreamComponent> create(MediaStreamDescriptor* stream, PassRefPtr<MediaStreamSource> source)
     {
-        return adoptRef(new MediaStreamComponent(stream, source));
+        return adoptRef(new MediaStreamComponent(createCanonicalUUIDString(), stream, source));
     }
 
     MediaStreamDescriptor* stream() const { return m_stream; }
     void setStream(MediaStreamDescriptor* stream) { ASSERT(!m_stream && stream); m_stream = stream; }
 
     MediaStreamSource* source() const { return m_source.get(); }
 
     String id() const { return m_id; }
     bool enabled() const { return m_enabled; }
     void setEnabled(bool enabled) { m_enabled = enabled; }
 
 private:
-    MediaStreamComponent(MediaStreamDescriptor* stream, PassRefPtr<MediaStreamSource> source)
+    MediaStreamComponent(const String& id, MediaStreamDescriptor* stream, PassRefPtr<MediaStreamSource> source)
         : m_stream(stream)
         , m_source(source)
-        , m_id(createCanonicalUUIDString())
+        , m_id(id)
         , m_enabled(true)
     {
+        ASSERT(m_id.length());
     }
 
     MediaStreamDescriptor* m_stream;
     RefPtr<MediaStreamSource> m_source;
     String m_id;
     bool m_enabled;
 };
 
+typedef Vector<RefPtr<MediaStreamComponent> > MediaStreamComponentVector;
+
 } // namespace WebCore
 
 #endif // ENABLE(MEDIA_STREAM)
 
 #endif // MediaStreamComponent_h