Changeset 131914 in webkit

Timestamp:

Oct 19, 2012 10:14:40 AM (12 years ago)

Author:

tommyw@google.com

Message:

MediaStream API: Rename owner to client in MediaStreamDescriptor
​https://bugs.webkit.org/show_bug.cgi?id=99593

Reviewed by Adam Barth.

This patch renames owner to client in MediaStreamDescriptor as discussed in #99080.

No new tests needed, covered by existing tests.

• Modules/mediastream/MediaStream.cpp:

(WebCore::MediaStream::MediaStream):
(WebCore::MediaStream::~MediaStream):

• Modules/mediastream/MediaStream.h:

(MediaStream):

• Modules/mediastream/PeerConnection00.cpp:

(WebCore::PeerConnection00::didRemoveRemoteStream):

• Modules/mediastream/RTCPeerConnection.cpp:

(WebCore::RTCPeerConnection::didRemoveRemoteStream):

• platform/mediastream/MediaStreamCenter.cpp:

(WebCore::MediaStreamCenter::endLocalMediaStream):
(WebCore::MediaStreamCenter::addMediaStreamTrack):
(WebCore::MediaStreamCenter::removeMediaStreamTrack):

• platform/mediastream/MediaStreamDescriptor.h:

(WebCore::MediaStreamDescriptorClient::~MediaStreamDescriptorClient):
(WebCore::MediaStreamDescriptor::client):
(WebCore::MediaStreamDescriptor::setClient):
(WebCore::MediaStreamDescriptor::MediaStreamDescriptor):
(MediaStreamDescriptor):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaStream.cpp (modified) (2 diffs)
• Modules/mediastream/MediaStream.h (modified) (3 diffs)
• Modules/mediastream/PeerConnection00.cpp (modified) (1 diff)
• Modules/mediastream/RTCPeerConnection.cpp (modified) (1 diff)
• platform/mediastream/MediaStreamCenter.cpp (modified) (2 diffs)
• platform/mediastream/MediaStreamDescriptor.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-19  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Rename owner to client in MediaStreamDescriptor
+        https://bugs.webkit.org/show_bug.cgi?id=99593
+
+        Reviewed by Adam Barth.
+
+        This patch renames owner to client in MediaStreamDescriptor as discussed in #99080.
+
+        No new tests needed, covered by existing tests.
+
+        * Modules/mediastream/MediaStream.cpp:
+        (WebCore::MediaStream::MediaStream):
+        (WebCore::MediaStream::~MediaStream):
+        * Modules/mediastream/MediaStream.h:
+        (MediaStream):
+        * Modules/mediastream/PeerConnection00.cpp:
+        (WebCore::PeerConnection00::didRemoveRemoteStream):
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        (WebCore::RTCPeerConnection::didRemoveRemoteStream):
+        * platform/mediastream/MediaStreamCenter.cpp:
+        (WebCore::MediaStreamCenter::endLocalMediaStream):
+        (WebCore::MediaStreamCenter::addMediaStreamTrack):
+        (WebCore::MediaStreamCenter::removeMediaStreamTrack):
+        * platform/mediastream/MediaStreamDescriptor.h:
+        (WebCore::MediaStreamDescriptorClient::~MediaStreamDescriptorClient):
+        (WebCore::MediaStreamDescriptor::client):
+        (WebCore::MediaStreamDescriptor::setClient):
+        (WebCore::MediaStreamDescriptor::MediaStreamDescriptor):
+        (MediaStreamDescriptor):
+
 2012-10-19  Shinya Kawanaka  <shinyak@chromium.org>
 

trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp

@@ -89 +89 @@
     , m_descriptor(streamDescriptor)
 {
-    m_descriptor->setOwner(this);
+    m_descriptor->setClient(this);
 
     MediaStreamTrackVector audioTrackVector;
@@ -108 +108 @@
 MediaStream::~MediaStream()
 {
-    m_descriptor->setOwner(0);
+    m_descriptor->setClient(0);
     m_audioTracks->detachOwner();
     m_videoTracks->detachOwner();

trunk/Source/WebCore/Modules/mediastream/MediaStream.h

@@ -38 +38 @@
 namespace WebCore {
 
-class MediaStream : public RefCounted<MediaStream>, public MediaStreamDescriptorOwner, public EventTarget, public ContextDestructionObserver {
+class MediaStream : public RefCounted<MediaStream>, public MediaStreamDescriptorClient, public EventTarget, public ContextDestructionObserver {
 public:
     enum ReadyState {
@@ -59 +59 @@
     virtual bool isLocal() const { return false; }
 
-    // MediaStreamDescriptorOwner
+    // MediaStreamDescriptorClient
     virtual void streamEnded() OVERRIDE;
 
@@ -83 +83 @@
     virtual void derefEventTarget() OVERRIDE { deref(); }
 
-    // MediaStreamDescriptorOwner
+    // MediaStreamDescriptorClient
     virtual void addTrack(MediaStreamComponent*) OVERRIDE;
     virtual void removeTrack(MediaStreamComponent*) OVERRIDE;

trunk/Source/WebCore/Modules/mediastream/PeerConnection00.cpp

@@ -413 +413 @@
 {
     ASSERT(scriptExecutionContext()->isContextThread());
-    ASSERT(streamDescriptor->owner());
-
-    RefPtr<MediaStream> stream = static_cast<MediaStream*>(streamDescriptor->owner());
+    ASSERT(streamDescriptor->client());
+
+    RefPtr<MediaStream> stream = static_cast<MediaStream*>(streamDescriptor->client());
     stream->streamEnded();
 

trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp

@@ -484 +484 @@
 {
     ASSERT(scriptExecutionContext()->isContextThread());
-    ASSERT(streamDescriptor->owner());
-
-    RefPtr<MediaStream> stream = static_cast<MediaStream*>(streamDescriptor->owner());
+    ASSERT(streamDescriptor->client());
+
+    RefPtr<MediaStream> stream = static_cast<MediaStream*>(streamDescriptor->client());
     stream->streamEnded();
 

trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp

@@ -50 +50 @@
 void MediaStreamCenter::endLocalMediaStream(MediaStreamDescriptor* streamDescriptor)
 {
-    MediaStreamDescriptorOwner* owner = streamDescriptor->owner();
-    if (owner)
-        owner->streamEnded();
+    MediaStreamDescriptorClient* client = streamDescriptor->client();
+    if (client)
+        client->streamEnded();
     else
         streamDescriptor->setEnded();
@@ -59 +59 @@
 void MediaStreamCenter::addMediaStreamTrack(MediaStreamDescriptor* streamDescriptor, MediaStreamComponent* component)
 {
-    MediaStreamDescriptorOwner* owner = streamDescriptor->owner();
-    if (owner)
-        owner->addTrack(component);
+    MediaStreamDescriptorClient* client = streamDescriptor->client();
+    if (client)
+        client->addTrack(component);
 }
 
 void MediaStreamCenter::removeMediaStreamTrack(MediaStreamDescriptor* streamDescriptor, MediaStreamComponent* component)
 {
-    MediaStreamDescriptorOwner* owner = streamDescriptor->owner();
-    if (owner)
-        owner->removeTrack(component);
+    MediaStreamDescriptorClient* client = streamDescriptor->client();
+    if (client)
+        client->removeTrack(component);
 }
 

trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.h

@@ -41 +41 @@
 namespace WebCore {
 
-class MediaStreamDescriptorOwner {
+class MediaStreamDescriptorClient {
 public:
-    virtual ~MediaStreamDescriptorOwner() { }
+    virtual ~MediaStreamDescriptorClient() { }
 
     virtual void streamEnded() = 0;
@@ -62 +62 @@
     }
 
-    MediaStreamDescriptorOwner* owner() const { return m_owner; }
-    void setOwner(MediaStreamDescriptorOwner* owner) { m_owner = owner; }
+    MediaStreamDescriptorClient* client() const { return m_client; }
+    void setClient(MediaStreamDescriptorClient* client) { m_client = client; }
 
     String label() const { return m_label; }
@@ -81 +81 @@
 private:
     MediaStreamDescriptor(const String& label, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
-        : m_owner(0)
+        : m_client(0)
         , m_label(label)
         , m_ended(false)
@@ -92 +92 @@
     }
 
-    MediaStreamDescriptorOwner* m_owner;
+    MediaStreamDescriptorClient* m_client;
     String m_label;
     Vector<RefPtr<MediaStreamComponent> > m_audioComponents;