Title: [139775] trunk/Source/WebCore
- Revision
- 139775
- Author
- tom...@google.com
- Date
- 2013-01-15 12:47:18 -0800 (Tue, 15 Jan 2013)
Log Message
MediaStream API: Rename the [add|remove]Track callbacks to [add|remove]RemoteTrack for clarity
https://bugs.webkit.org/show_bug.cgi?id=106791
Reviewed by Adam Barth.
No tests needed.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::addRemoteTrack):
(WebCore::MediaStream::removeRemoteTrack):
* Modules/mediastream/MediaStream.h:
* platform/mediastream/MediaStreamCenter.cpp:
(WebCore::MediaStreamCenter::addMediaStreamTrack):
(WebCore::MediaStreamCenter::removeMediaStreamTrack):
* platform/mediastream/MediaStreamDescriptor.h:
(MediaStreamDescriptorClient):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (139774 => 139775)
--- trunk/Source/WebCore/ChangeLog 2013-01-15 20:46:19 UTC (rev 139774)
+++ trunk/Source/WebCore/ChangeLog 2013-01-15 20:47:18 UTC (rev 139775)
@@ -1,3 +1,22 @@
+2013-01-15 Tommy Widenflycht <tom...@google.com>
+
+ MediaStream API: Rename the [add|remove]Track callbacks to [add|remove]RemoteTrack for clarity
+ https://bugs.webkit.org/show_bug.cgi?id=106791
+
+ Reviewed by Adam Barth.
+
+ No tests needed.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::addRemoteTrack):
+ (WebCore::MediaStream::removeRemoteTrack):
+ * Modules/mediastream/MediaStream.h:
+ * platform/mediastream/MediaStreamCenter.cpp:
+ (WebCore::MediaStreamCenter::addMediaStreamTrack):
+ (WebCore::MediaStreamCenter::removeMediaStreamTrack):
+ * platform/mediastream/MediaStreamDescriptor.h:
+ (MediaStreamDescriptorClient):
+
2013-01-15 Mark Pilgrim <pilg...@chromium.org>
[Chromium] Move SocketStreamHandle and SocketStreamHandleInternal to WebCore/platform
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (139774 => 139775)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2013-01-15 20:46:19 UTC (rev 139774)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2013-01-15 20:47:18 UTC (rev 139775)
@@ -255,7 +255,7 @@
return &m_eventTargetData;
}
-void MediaStream::addTrack(MediaStreamComponent* component)
+void MediaStream::addRemoteTrack(MediaStreamComponent* component)
{
if (ended())
return;
@@ -273,7 +273,7 @@
scheduleDispatchEvent(MediaStreamTrackEvent::create(eventNames().addtrackEvent, false, false, track));
}
-void MediaStream::removeTrack(MediaStreamComponent* component)
+void MediaStream::removeRemoteTrack(MediaStreamComponent* component)
{
if (ended())
return;
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (139774 => 139775)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2013-01-15 20:46:19 UTC (rev 139774)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2013-01-15 20:47:18 UTC (rev 139775)
@@ -95,8 +95,8 @@
virtual void derefEventTarget() OVERRIDE { deref(); }
// MediaStreamDescriptorClient
- virtual void addTrack(MediaStreamComponent*) OVERRIDE;
- virtual void removeTrack(MediaStreamComponent*) OVERRIDE;
+ virtual void addRemoteTrack(MediaStreamComponent*) OVERRIDE;
+ virtual void removeRemoteTrack(MediaStreamComponent*) OVERRIDE;
void scheduleDispatchEvent(PassRefPtr<Event>);
void scheduledEventTimerFired(Timer<MediaStream>*);
Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp (139774 => 139775)
--- trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp 2013-01-15 20:46:19 UTC (rev 139774)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp 2013-01-15 20:47:18 UTC (rev 139775)
@@ -60,14 +60,14 @@
{
MediaStreamDescriptorClient* client = streamDescriptor->client();
if (client)
- client->addTrack(component);
+ client->addRemoteTrack(component);
}
void MediaStreamCenter::removeMediaStreamTrack(MediaStreamDescriptor* streamDescriptor, MediaStreamComponent* component)
{
MediaStreamDescriptorClient* client = streamDescriptor->client();
if (client)
- client->removeTrack(component);
+ client->removeRemoteTrack(component);
}
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.h (139774 => 139775)
--- trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.h 2013-01-15 20:46:19 UTC (rev 139774)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.h 2013-01-15 20:47:18 UTC (rev 139775)
@@ -45,8 +45,8 @@
virtual ~MediaStreamDescriptorClient() { }
virtual void streamEnded() = 0;
- virtual void addTrack(MediaStreamComponent*) = 0;
- virtual void removeTrack(MediaStreamComponent*) = 0;
+ virtual void addRemoteTrack(MediaStreamComponent*) = 0;
+ virtual void removeRemoteTrack(MediaStreamComponent*) = 0;
};
class MediaStreamDescriptor : public RefCounted<MediaStreamDescriptor> {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
