Changeset 116321 in webkit


Ignore:
Timestamp:
May 7, 2012 10:56:30 AM (12 years ago)
Author:
tommyw@google.com
Message:

MediaStream API: Rename MediaStreamCenter::didConstructMediaStream
​https://bugs.webkit.org/show_bug.cgi?id=85796

Reviewed by Adam Barth.

Source/Platform:

Renamed WebMediaStreamCenter::didConstructMediaStream to didCreateMediaStream,
and change so that it is only called for MediaStreams created from JS.
Also send out the WebMediaStreamDescriptor non-const instead.

  • chromium/public/WebMediaStreamCenter.h:

(WebKit::WebMediaStreamCenter::didCreateMediaStream):
(WebMediaStreamCenter):
(WebKit::WebMediaStreamCenter::didConstructMediaStream):

Source/WebCore:

Renamed MediaStreamCenter::didConstructMediaStream to didCreateMediaStream,
and change so that it is only called for MediaStreams created from JS.

Not really testable.

  • Modules/mediastream/MediaStream.cpp:

(WebCore::MediaStream::create):

  • platform/mediastream/MediaStreamCenter.h:

(MediaStreamCenter):

  • platform/mediastream/chromium/MediaStreamCenterChromium.cpp:

(WebCore::MediaStreamCenterChromium::didCreateMediaStream):

  • platform/mediastream/chromium/MediaStreamCenterChromium.h:

(MediaStreamCenterChromium):

  • platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp:

(WebCore::MediaStreamCenterGStreamer::didCreateMediaStream):

  • platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h:

(MediaStreamCenterGStreamer):

Location:
trunk/Source
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/Platform/ChangeLog

    r116317 r116321  
     12012-05-07  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Rename MediaStreamCenter::didConstructMediaStream
     4        https://bugs.webkit.org/show_bug.cgi?id=85796
     5
     6        Reviewed by Adam Barth.
     7
     8        Renamed WebMediaStreamCenter::didConstructMediaStream to didCreateMediaStream,
     9        and change so that it is only called for MediaStreams created from JS.
     10        Also send out the WebMediaStreamDescriptor non-const instead.
     11
     12        * chromium/public/WebMediaStreamCenter.h:
     13        (WebKit::WebMediaStreamCenter::didCreateMediaStream):
     14        (WebMediaStreamCenter):
     15        (WebKit::WebMediaStreamCenter::didConstructMediaStream):
     16
    1172012-05-07  Tommy Widenflycht  <tommyw@google.com>
    218

  • trunk/Source/Platform/chromium/public/WebMediaStreamCenter.h

    r112784 r116321  
    4949    virtual void didDisableMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent&) = 0;
    5050    virtual void didStopLocalMediaStream(const WebMediaStreamDescriptor&) = 0;
    51     virtual void didConstructMediaStream(const WebMediaStreamDescriptor&) = 0;
     51    virtual void didCreateMediaStream(WebMediaStreamDescriptor&) { }
    5252
    53     // FIXME: Make pure virtual after implementation.
    54     virtual WebString constructSDP(const WebICECandidateDescriptor&) { return WebString(); }
    55     virtual WebString constructSDP(const WebSessionDescriptionDescriptor&) { return WebString(); }
     53    // DEPRECATED
     54    virtual void didConstructMediaStream(const WebMediaStreamDescriptor&) { }
     55
     56    virtual WebString constructSDP(const WebICECandidateDescriptor&) = 0;
     57    virtual WebString constructSDP(const WebSessionDescriptionDescriptor&) = 0;
    5658};
    5759

  • trunk/Source/WebCore/ChangeLog

    r116319 r116321  
     12012-05-07  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Rename MediaStreamCenter::didConstructMediaStream
     4        https://bugs.webkit.org/show_bug.cgi?id=85796
     5
     6        Reviewed by Adam Barth.
     7
     8        Renamed MediaStreamCenter::didConstructMediaStream to didCreateMediaStream,
     9        and change so that it is only called for MediaStreams created from JS.
     10
     11        Not really testable.
     12
     13        * Modules/mediastream/MediaStream.cpp:
     14        (WebCore::MediaStream::create):
     15        * platform/mediastream/MediaStreamCenter.h:
     16        (MediaStreamCenter):
     17        * platform/mediastream/chromium/MediaStreamCenterChromium.cpp:
     18        (WebCore::MediaStreamCenterChromium::didCreateMediaStream):
     19        * platform/mediastream/chromium/MediaStreamCenterChromium.h:
     20        (MediaStreamCenterChromium):
     21        * platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp:
     22        (WebCore::MediaStreamCenterGStreamer::didCreateMediaStream):
     23        * platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h:
     24        (MediaStreamCenterGStreamer):
     25
    1262012-05-07  Nat Duca  <nduca@chromium.org>
    227

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

    r116311 r116321  
    7575
    7676    RefPtr<MediaStreamDescriptor> descriptor = MediaStreamDescriptor::create(createCanonicalUUIDString(), audioSources, videoSources);
    77     MediaStreamCenter::instance().didConstructMediaStream(descriptor.get());
     77    MediaStreamCenter::instance().didCreateMediaStream(descriptor.get());
    7878
    7979    return adoptRef(new MediaStream(context, descriptor.release()));

  • trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h

    r113462 r116321  
    5959    virtual void didSetMediaStreamTrackEnabled(MediaStreamDescriptor*, MediaStreamComponent*) = 0;
    6060    virtual void didStopLocalMediaStream(MediaStreamDescriptor*) = 0;
    61     virtual void didConstructMediaStream(MediaStreamDescriptor*) = 0;
     61    virtual void didCreateMediaStream(MediaStreamDescriptor*) = 0;
    6262
    6363    virtual String constructSDP(IceCandidateDescriptor*) = 0;

  • trunk/Source/WebCore/platform/mediastream/chromium/MediaStreamCenterChromium.cpp

    r113462 r116321  
    9090}
    9191
    92 void MediaStreamCenterChromium::didConstructMediaStream(MediaStreamDescriptor* stream)
     92void MediaStreamCenterChromium::didCreateMediaStream(MediaStreamDescriptor* stream)
    9393{
    94     if (m_private)
     94    if (m_private) {
     95        // FIXME: Remove when Chromium have switched to the new API.
    9596        m_private->didConstructMediaStream(stream);
     97
     98        WebKit::WebMediaStreamDescriptor webStream(stream);
     99        m_private->didCreateMediaStream(webStream);
     100    }
    96101}
    97102

  • trunk/Source/WebCore/platform/mediastream/chromium/MediaStreamCenterChromium.h

    r113462 r116321  
    6363    virtual void didSetMediaStreamTrackEnabled(MediaStreamDescriptor*, MediaStreamComponent*) OVERRIDE;
    6464    virtual void didStopLocalMediaStream(MediaStreamDescriptor*) OVERRIDE;
    65     virtual void didConstructMediaStream(MediaStreamDescriptor*) OVERRIDE;
     65    virtual void didCreateMediaStream(MediaStreamDescriptor*) OVERRIDE;
    6666    virtual String constructSDP(IceCandidateDescriptor*) OVERRIDE;
    6767    virtual String constructSDP(SessionDescriptionDescriptor*) OVERRIDE;

  • trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp

    r113462 r116321  
    7373}
    7474
    75 void MediaStreamCenterGStreamer::didConstructMediaStream(MediaStreamDescriptor*)
     75void MediaStreamCenterGStreamer::didCreateMediaStream(MediaStreamDescriptor*)
    7676{
    7777}

  • trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h

    r113462 r116321  
    5757    virtual void didSetMediaStreamTrackEnabled(MediaStreamDescriptor*, MediaStreamComponent*) OVERRIDE;
    5858    virtual void didStopLocalMediaStream(MediaStreamDescriptor*) OVERRIDE;
    59     virtual void didConstructMediaStream(MediaStreamDescriptor*) OVERRIDE;
     59    virtual void didCreateMediaStream(MediaStreamDescriptor*) OVERRIDE;
    6060    virtual String constructSDP(IceCandidateDescriptor*) OVERRIDE;
    6161    virtual String constructSDP(SessionDescriptionDescriptor*) OVERRIDE;
Note: See TracChangeset for help on using the changeset viewer.