Changeset 131814 in webkit


Ignore:
Timestamp:
Oct 18, 2012 3:08:31 PM (12 years ago)
Author:
tommyw@google.com
Message:

MediaStream API: Do some cleanup in the chromium WebKit API
​https://bugs.webkit.org/show_bug.cgi?id=99713

Reviewed by Adam Barth.

Source/Platform:

Removing the deprecated version of WebMediaStreamDescriptor::initialize and making
the two constructSDP functions in WebMediaStreamCenter optional to override.
This is part of the preparation to remove PeerConnection00.

  • chromium/public/WebMediaStreamCenter.h:

(WebKit::WebMediaStreamCenter::constructSDP):

  • chromium/public/WebMediaStreamDescriptor.h:

(WebMediaStreamDescriptor):

Source/WebCore:

Removing the deprecated version of WebMediaStreamDescriptor::initialize.

No testing needed since only an unused function is removed.

  • platform/chromium/support/WebMediaStreamDescriptor.cpp:
Location:
trunk/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/Platform/ChangeLog

    r131697 r131814  
     12012-10-18  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Do some cleanup in the chromium WebKit API
     4        https://bugs.webkit.org/show_bug.cgi?id=99713
     5
     6        Reviewed by Adam Barth.
     7
     8        Removing the deprecated version of WebMediaStreamDescriptor::initialize and making
     9        the two constructSDP functions in WebMediaStreamCenter optional to override.
     10        This is part of the preparation to remove PeerConnection00.
     11
     12        * chromium/public/WebMediaStreamCenter.h:
     13        (WebKit::WebMediaStreamCenter::constructSDP):
     14        * chromium/public/WebMediaStreamDescriptor.h:
     15        (WebMediaStreamDescriptor):
     16
    1172012-10-17  Adrienne Walker  <enne@chromium.org>
    218

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

    r127485 r131814  
    5252    virtual void didStopLocalMediaStream(const WebMediaStreamDescriptor&) = 0;
    5353    virtual void didCreateMediaStream(WebMediaStreamDescriptor&) = 0;
    54     virtual WebString constructSDP(const WebICECandidateDescriptor&) = 0;
    55     virtual WebString constructSDP(const WebSessionDescriptionDescriptor&) = 0;
     54    virtual WebString constructSDP(const WebICECandidateDescriptor&) { return WebString(); }
     55    virtual WebString constructSDP(const WebSessionDescriptionDescriptor&) { return WebString(); }
    5656};
    5757

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

    r123627 r131814  
    6060    WEBKIT_EXPORT void assign(const WebMediaStreamDescriptor&);
    6161
    62     // DEPRECATED
    63     WEBKIT_EXPORT void initialize(const WebString& label, const WebVector<WebMediaStreamSource>&);
    64 
    6562    WEBKIT_EXPORT void initialize(const WebString& label, const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources);
    6663    WEBKIT_EXPORT void reset();

  • trunk/Source/WebCore/ChangeLog

    r131810 r131814  
     12012-10-18  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Do some cleanup in the chromium WebKit API
     4        https://bugs.webkit.org/show_bug.cgi?id=99713
     5
     6        Reviewed by Adam Barth.
     7
     8        Removing the deprecated version of WebMediaStreamDescriptor::initialize.
     9
     10        No testing needed since only an unused function is removed.
     11
     12        * platform/chromium/support/WebMediaStreamDescriptor.cpp:
     13
    1142012-10-18  Alpha Lam  <hclam@chromium.org>
    215

  • trunk/Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp

    r123627 r131814  
    126126}
    127127
    128 // FIXME: Cleanup when the chromium code has switched to the split sources implementation.
    129 void WebMediaStreamDescriptor::initialize(const WebString& label, const WebVector<WebMediaStreamSource>& sources)
    130 {
    131     MediaStreamSourceVector audio, video;
    132     for (size_t i = 0; i < sources.size(); ++i) {
    133         MediaStreamSource* curr = sources[i];
    134         if (curr->type() == MediaStreamSource::TypeAudio)
    135             audio.append(curr);
    136         else if (curr->type() == MediaStreamSource::TypeVideo)
    137             video.append(curr);
    138     }
    139     m_private = MediaStreamDescriptor::create(label, audio, video);
    140 }
    141 
    142128void WebMediaStreamDescriptor::initialize(const WebString& label, const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources)
    143129{
Note: See TracChangeset for help on using the changeset viewer.