Changeset 194371 in webkit

Timestamp:

Dec 22, 2015, 1:45:49 PM (9 years ago)

Author:

eric.carlson@apple.com

Message:

[MediaStream] MediaStreamTrackPrivate.source should be a reference
​https://bugs.webkit.org/show_bug.cgi?id=152509

Reviewed by Tim Horton.

No new tests, no functional change.

• Modules/mediastream/MediaStream.cpp:

(WebCore::MediaStream::trackVectorForType):

• Modules/mediastream/MediaStreamTrack.h:
• Modules/mediastream/RTCDTMFSender.cpp:

(WebCore::RTCDTMFSender::create):

• Modules/mediastream/UserMediaRequest.cpp:

(WebCore::UserMediaRequest::didCreateStream):

• platform/mediastream/MediaStreamPrivate.cpp:

(WebCore::MediaStreamPrivate::platformLayer):
(WebCore::MediaStreamPrivate::currentFrameImage):

• platform/mediastream/MediaStreamTrackPrivate.cpp:

(WebCore::MediaStreamTrackPrivate::MediaStreamTrackPrivate):

• platform/mediastream/MediaStreamTrackPrivate.h:

(WebCore::MediaStreamTrackPrivate::source):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaStream.cpp (modified) (1 diff)
• Modules/mediastream/MediaStreamTrack.h (modified) (1 diff)
• Modules/mediastream/RTCDTMFSender.cpp (modified) (1 diff)
• Modules/mediastream/UserMediaRequest.cpp (modified) (2 diffs)
• platform/mediastream/MediaStreamPrivate.cpp (modified) (2 diffs)
• platform/mediastream/MediaStreamTrackPrivate.cpp (modified) (1 diff)
• platform/mediastream/MediaStreamTrackPrivate.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2015-12-22  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] MediaStreamTrackPrivate.source should be a reference
+        https://bugs.webkit.org/show_bug.cgi?id=152509
+
+        Reviewed by Tim Horton.
+
+        No new tests, no functional change.
+
+        * Modules/mediastream/MediaStream.cpp:
+        (WebCore::MediaStream::trackVectorForType):
+        * Modules/mediastream/MediaStreamTrack.h:
+        * Modules/mediastream/RTCDTMFSender.cpp:
+        (WebCore::RTCDTMFSender::create):
+        * Modules/mediastream/UserMediaRequest.cpp:
+        (WebCore::UserMediaRequest::didCreateStream):
+        * platform/mediastream/MediaStreamPrivate.cpp:
+        (WebCore::MediaStreamPrivate::platformLayer):
+        (WebCore::MediaStreamPrivate::currentFrameImage):
+        * platform/mediastream/MediaStreamTrackPrivate.cpp:
+        (WebCore::MediaStreamTrackPrivate::MediaStreamTrackPrivate):
+        * platform/mediastream/MediaStreamTrackPrivate.h:
+        (WebCore::MediaStreamTrackPrivate::source):
+
 2015-12-22  Commit Queue  <commit-queue@webkit.org>
 

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

@@ -316 +316 @@
     MediaStreamTrackVector tracks;
     for (auto& track : m_trackSet.values()) {
-        if (track->source()->type() == filterType)
+        if (track->source().type() == filterType)
             tracks.append(track);
     }

trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h ¶

@@ -84 +84 @@
     void applyConstraints(const MediaConstraints&);
 
-    RealtimeMediaSource* source() const { return m_private->source(); }
+    RealtimeMediaSource& source() const { return m_private->source(); }
     MediaStreamTrackPrivate& privateTrack() { return m_private.get(); }
 

trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp ¶

@@ -48 +48 @@
 {
     RefPtr<MediaStreamTrack> track = prpTrack;
-    std::unique_ptr<RTCDTMFSenderHandler> handler = peerConnectionHandler->createDTMFSender(track->source());
+    std::unique_ptr<RTCDTMFSenderHandler> handler = peerConnectionHandler->createDTMFSender(&track->source());
     if (!handler) {
         ec = NOT_SUPPORTED_ERR;

trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp ¶

@@ -168 +168 @@
         for (auto& track : stream->getAudioTracks()) {
             track->applyConstraints(*m_audioConstraints);
-            track->source()->startProducingData();
+            track->source().startProducingData();
         }
     }
@@ -174 +174 @@
         for (auto& track : stream->getVideoTracks()) {
             track->applyConstraints(*m_videoConstraints);
-            track->source()->startProducingData();
+            track->source().startProducingData();
         }
     }

trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp ¶

@@ -218 +218 @@
         return nullptr;
 
-    return m_activeVideoTrack->source()->platformLayer();
+    return m_activeVideoTrack->source().platformLayer();
 }
 
@@ -242 +242 @@
         return nullptr;
 
-    return m_activeVideoTrack->source()->currentFrameImage();
+    return m_activeVideoTrack->source().currentFrameImage();
 }
 

trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp ¶

@@ -51 +51 @@
 MediaStreamTrackPrivate::MediaStreamTrackPrivate(const MediaStreamTrackPrivate& other)
     : RefCounted()
-    , m_source(other.source())
+    , m_source(&other.source())
     , m_id(createCanonicalUUIDString())
     , m_isEnabled(other.enabled())

trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h ¶

@@ -78 +78 @@
     RefPtr<MediaStreamTrackPrivate> clone();
 
-    RealtimeMediaSource* source() const { return m_source.get(); }
+    RealtimeMediaSource& source() const { return *m_source.get(); }
     RealtimeMediaSource::Type type() const;