Title: [158470] trunk/Source/WebCore
- Revision
- 158470
- Author
- commit-qu...@webkit.org
- Date
- 2013-11-01 18:20:50 -0700 (Fri, 01 Nov 2013)
Log Message
Removing unnecessary early returns in addTrack, removeTrack and removeRemoteSource methods
https://bugs.webkit.org/show_bug.cgi?id=123644
Patch by Thiago de Barros Lacerda <thiago.lace...@openbossa.org> on 2013-11-01
Reviewed by Eric Carlson.
No new tests needed.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::addTrack):
(WebCore::MediaStream::removeTrack):
(WebCore::MediaStream::removeRemoteSource):
(WebCore::MediaStream::trackVectorForType):
* Modules/mediastream/MediaStream.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158469 => 158470)
--- trunk/Source/WebCore/ChangeLog 2013-11-02 01:03:21 UTC (rev 158469)
+++ trunk/Source/WebCore/ChangeLog 2013-11-02 01:20:50 UTC (rev 158470)
@@ -1,3 +1,19 @@
+2013-11-01 Thiago de Barros Lacerda <thiago.lace...@openbossa.org>
+
+ Removing unnecessary early returns in addTrack, removeTrack and removeRemoteSource methods
+ https://bugs.webkit.org/show_bug.cgi?id=123644
+
+ Reviewed by Eric Carlson.
+
+ No new tests needed.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::addTrack):
+ (WebCore::MediaStream::removeTrack):
+ (WebCore::MediaStream::removeRemoteSource):
+ (WebCore::MediaStream::trackVectorForType):
+ * Modules/mediastream/MediaStream.h:
+
2013-11-01 Andreas Kling <akl...@apple.com>
CSSAspectRatioValue construction helper should return PassRef.
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (158469 => 158470)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2013-11-02 01:03:21 UTC (rev 158469)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2013-11-02 01:20:50 UTC (rev 158470)
@@ -163,11 +163,8 @@
if (getTrackById(track->id()))
return false;
- MediaStreamTrackVector* tracks = getTrackVectorForType(track->source()->type());
+ MediaStreamTrackVector* tracks = trackVectorForType(track->source()->type());
- if (!tracks)
- return false;
-
tracks->append(track);
track->addObserver(this);
m_descriptor->addTrack(&track->privateTrack());
@@ -194,11 +191,8 @@
// This is a common part used by removeTrack called by _javascript_
// and removeRemoteTrack and only removeRemoteTrack must fire removetrack event
RefPtr<MediaStreamTrack> track = prpTrack;
- MediaStreamTrackVector* tracks = getTrackVectorForType(track->source()->type());
+ MediaStreamTrackVector* tracks = trackVectorForType(track->source()->type());
- if (!tracks)
- return false;
-
size_t pos = tracks->find(track);
if (pos == notFound)
return false;
@@ -290,11 +284,8 @@
if (ended())
return;
- Vector<RefPtr<MediaStreamTrack>>* tracks = getTrackVectorForType(source->type());
+ Vector<RefPtr<MediaStreamTrack>>* tracks = trackVectorForType(source->type());
- if (!tracks)
- return;
-
for (int i = tracks->size() - 1; i >= 0; --i) {
if ((*tracks)[i]->source() != source)
continue;
@@ -371,21 +362,17 @@
return MediaStreamRegistry::registry();
}
-MediaStreamTrackVector* MediaStream::getTrackVectorForType(MediaStreamSource::Type type)
+MediaStreamTrackVector* MediaStream::trackVectorForType(MediaStreamSource::Type type)
{
- MediaStreamTrackVector* tracks = nullptr;
switch (type) {
case MediaStreamSource::Audio:
- tracks = &m_audioTracks;
- break;
+ return &m_audioTracks;
case MediaStreamSource::Video:
- tracks = &m_videoTracks;
- break;
+ return &m_videoTracks;
case MediaStreamSource::None:
ASSERT_NOT_REACHED();
- break;
}
- return tracks;
+ return nullptr;
}
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (158469 => 158470)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2013-11-02 01:03:21 UTC (rev 158469)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2013-11-02 01:20:50 UTC (rev 158470)
@@ -110,7 +110,7 @@
void cloneMediaStreamTrackVector(MediaStreamTrackVector&, const MediaStreamTrackVector&);
- MediaStreamTrackVector* getTrackVectorForType(MediaStreamSource::Type);
+ MediaStreamTrackVector* trackVectorForType(MediaStreamSource::Type);
RefPtr<MediaStreamDescriptor> m_descriptor;
MediaStreamTrackVector m_audioTracks;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
