- Revision
- 131914
- Author
- [email protected]
- Date
- 2012-10-19 10:14:40 -0700 (Fri, 19 Oct 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (131913 => 131914)
--- trunk/Source/WebCore/ChangeLog 2012-10-19 17:09:42 UTC (rev 131913)
+++ trunk/Source/WebCore/ChangeLog 2012-10-19 17:14:40 UTC (rev 131914)
@@ -1,3 +1,34 @@
+2012-10-19 Tommy Widenflycht <[email protected]>
+
+ 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 <[email protected]>
Elements assigned to <shadow> should not be reprojected.
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (131913 => 131914)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2012-10-19 17:09:42 UTC (rev 131913)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2012-10-19 17:14:40 UTC (rev 131914)
@@ -88,7 +88,7 @@
: ContextDestructionObserver(context)
, m_descriptor(streamDescriptor)
{
- m_descriptor->setOwner(this);
+ m_descriptor->setClient(this);
MediaStreamTrackVector audioTrackVector;
size_t numberOfAudioTracks = m_descriptor->numberOfAudioComponents();
@@ -107,7 +107,7 @@
MediaStream::~MediaStream()
{
- m_descriptor->setOwner(0);
+ m_descriptor->setClient(0);
m_audioTracks->detachOwner();
m_videoTracks->detachOwner();
}
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (131913 => 131914)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2012-10-19 17:09:42 UTC (rev 131913)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2012-10-19 17:14:40 UTC (rev 131914)
@@ -37,7 +37,7 @@
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 {
LIVE = 1,
@@ -58,7 +58,7 @@
virtual bool isLocal() const { return false; }
- // MediaStreamDescriptorOwner
+ // MediaStreamDescriptorClient
virtual void streamEnded() OVERRIDE;
MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); }
@@ -82,7 +82,7 @@
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
- // MediaStreamDescriptorOwner
+ // MediaStreamDescriptorClient
virtual void addTrack(MediaStreamComponent*) OVERRIDE;
virtual void removeTrack(MediaStreamComponent*) OVERRIDE;
Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnection00.cpp (131913 => 131914)
--- trunk/Source/WebCore/Modules/mediastream/PeerConnection00.cpp 2012-10-19 17:09:42 UTC (rev 131913)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnection00.cpp 2012-10-19 17:14:40 UTC (rev 131914)
@@ -412,9 +412,9 @@
void PeerConnection00::didRemoveRemoteStream(MediaStreamDescriptor* streamDescriptor)
{
ASSERT(scriptExecutionContext()->isContextThread());
- ASSERT(streamDescriptor->owner());
+ ASSERT(streamDescriptor->client());
- RefPtr<MediaStream> stream = static_cast<MediaStream*>(streamDescriptor->owner());
+ RefPtr<MediaStream> stream = static_cast<MediaStream*>(streamDescriptor->client());
stream->streamEnded();
if (m_readyState == CLOSED)
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (131913 => 131914)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2012-10-19 17:09:42 UTC (rev 131913)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2012-10-19 17:14:40 UTC (rev 131914)
@@ -483,9 +483,9 @@
void RTCPeerConnection::didRemoveRemoteStream(MediaStreamDescriptor* streamDescriptor)
{
ASSERT(scriptExecutionContext()->isContextThread());
- ASSERT(streamDescriptor->owner());
+ ASSERT(streamDescriptor->client());
- RefPtr<MediaStream> stream = static_cast<MediaStream*>(streamDescriptor->owner());
+ RefPtr<MediaStream> stream = static_cast<MediaStream*>(streamDescriptor->client());
stream->streamEnded();
if (m_readyState == ReadyStateClosed)
Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp (131913 => 131914)
--- trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp 2012-10-19 17:09:42 UTC (rev 131913)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp 2012-10-19 17:14:40 UTC (rev 131914)
@@ -49,25 +49,25 @@
void MediaStreamCenter::endLocalMediaStream(MediaStreamDescriptor* streamDescriptor)
{
- MediaStreamDescriptorOwner* owner = streamDescriptor->owner();
- if (owner)
- owner->streamEnded();
+ MediaStreamDescriptorClient* client = streamDescriptor->client();
+ if (client)
+ client->streamEnded();
else
streamDescriptor->setEnded();
}
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);
}
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.h (131913 => 131914)
--- trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.h 2012-10-19 17:09:42 UTC (rev 131913)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.h 2012-10-19 17:14:40 UTC (rev 131914)
@@ -40,9 +40,9 @@
namespace WebCore {
-class MediaStreamDescriptorOwner {
+class MediaStreamDescriptorClient {
public:
- virtual ~MediaStreamDescriptorOwner() { }
+ virtual ~MediaStreamDescriptorClient() { }
virtual void streamEnded() = 0;
virtual void addTrack(MediaStreamComponent*) = 0;
@@ -61,8 +61,8 @@
return adoptRef(new MediaStreamDescriptor(label, audioSources, videoSources));
}
- 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; }
@@ -80,7 +80,7 @@
private:
MediaStreamDescriptor(const String& label, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
- : m_owner(0)
+ : m_client(0)
, m_label(label)
, m_ended(false)
{
@@ -91,7 +91,7 @@
m_videoComponents.append(MediaStreamComponent::create(videoSources[i]));
}
- MediaStreamDescriptorOwner* m_owner;
+ MediaStreamDescriptorClient* m_client;
String m_label;
Vector<RefPtr<MediaStreamComponent> > m_audioComponents;
Vector<RefPtr<MediaStreamComponent> > m_videoComponents;
