Changeset 111577 in webkit


Ignore:
Timestamp:
Mar 21, 2012 10:55:04 AM (12 years ago)
Author:
tommyw@google.com
Message:

[chromium] MediaStream API (JSEP): Introducing WebSessionDescription and WebIceCandidate
​https://bugs.webkit.org/show_bug.cgi?id=81339

Reviewed by Adam Barth.

Source/WebCore:

Not possible to test until the entire JSEP feature is commited.

  • Modules/mediastream/IceCandidate.cpp:

(WebCore::IceCandidate::toSdp):

  • Modules/mediastream/SessionDescription.cpp:

(WebCore::SessionDescription::toSdp):

  • platform/mediastream/IceCandidateDescriptor.cpp:

(WebCore::IceCandidateDescriptor::toSDP):

  • platform/mediastream/IceCandidateDescriptor.h:

(IceCandidateDescriptor):

  • platform/mediastream/MediaStreamCenter.cpp:

(WebCore::MediaStreamCenter::constructSDP):

  • platform/mediastream/MediaStreamCenter.h:

(MediaStreamCenter):

  • platform/mediastream/SessionDescriptionDescriptor.cpp:

(WebCore::SessionDescriptionDescriptor::SessionDescriptionDescriptor):
(WebCore::SessionDescriptionDescriptor::toSDP):
(WebCore::SessionDescriptionDescriptor::initialSDP):

  • platform/mediastream/SessionDescriptionDescriptor.h:

(SessionDescriptionDescriptor):

Source/WebKit/chromium:

Simple WebKit representations of the WebCore/platform versions.

  • WebKit.gyp:
  • public/platform/WebICECandidateDescriptor.h: Added.

(WebCore):
(WebKit):
(WebICECandidateDescriptor):
(WebKit::WebICECandidateDescriptor::WebICECandidateDescriptor):
(WebKit::WebICECandidateDescriptor::~WebICECandidateDescriptor):
(WebKit::WebICECandidateDescriptor::operator=):
(WebKit::WebICECandidateDescriptor::isNull):

  • public/platform/WebSessionDescriptionDescriptor.h: Added.

(WebCore):
(WebKit):
(WebSessionDescriptionDescriptor):
(WebKit::WebSessionDescriptionDescriptor::WebSessionDescriptionDescriptor):
(WebKit::WebSessionDescriptionDescriptor::~WebSessionDescriptionDescriptor):
(WebKit::WebSessionDescriptionDescriptor::operator=):
(WebKit::WebSessionDescriptionDescriptor::isNull):

  • src/WebICECandidateDescriptor.cpp: Added.

(WebKit):
(WebKit::WebICECandidateDescriptor::WebICECandidateDescriptor):
(WebKit::WebICECandidateDescriptor::assign):
(WebKit::WebICECandidateDescriptor::reset):
(WebKit::WebICECandidateDescriptor::initialize):
(WebKit::WebICECandidateDescriptor::operator PassRefPtr<WebCore::IceCandidateDescriptor>):
(WebKit::WebICECandidateDescriptor::label):
(WebKit::WebICECandidateDescriptor::candidateLine):

  • src/WebSessionDescriptionDescriptor.cpp: Added.

(WebKit):
(WebKit::WebSessionDescriptionDescriptor::WebSessionDescriptionDescriptor):
(WebKit::WebSessionDescriptionDescriptor::assign):
(WebKit::WebSessionDescriptionDescriptor::reset):
(WebKit::WebSessionDescriptionDescriptor::operator WTF::PassRefPtr<WebCore::SessionDescriptionDescriptor>):
(WebKit::WebSessionDescriptionDescriptor::initialize):
(WebKit::WebSessionDescriptionDescriptor::numberOfAddedCandidates):
(WebKit::WebSessionDescriptionDescriptor::candidate):
(WebKit::WebSessionDescriptionDescriptor::initialSDP):

Location:
trunk/Source
Files:
4 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r111575 r111577  
     12012-03-21  Tommy Widenflycht  <tommyw@google.com>
     2
     3        [chromium] MediaStream API (JSEP): Introducing WebSessionDescription and WebIceCandidate
     4        https://bugs.webkit.org/show_bug.cgi?id=81339
     5
     6        Reviewed by Adam Barth.
     7
     8        Not possible to test until the entire JSEP feature is commited.
     9
     10        * Modules/mediastream/IceCandidate.cpp:
     11        (WebCore::IceCandidate::toSdp):
     12        * Modules/mediastream/SessionDescription.cpp:
     13        (WebCore::SessionDescription::toSdp):
     14        * platform/mediastream/IceCandidateDescriptor.cpp:
     15        (WebCore::IceCandidateDescriptor::toSDP):
     16        * platform/mediastream/IceCandidateDescriptor.h:
     17        (IceCandidateDescriptor):
     18        * platform/mediastream/MediaStreamCenter.cpp:
     19        (WebCore::MediaStreamCenter::constructSDP):
     20        * platform/mediastream/MediaStreamCenter.h:
     21        (MediaStreamCenter):
     22        * platform/mediastream/SessionDescriptionDescriptor.cpp:
     23        (WebCore::SessionDescriptionDescriptor::SessionDescriptionDescriptor):
     24        (WebCore::SessionDescriptionDescriptor::toSDP):
     25        (WebCore::SessionDescriptionDescriptor::initialSDP):
     26        * platform/mediastream/SessionDescriptionDescriptor.h:
     27        (SessionDescriptionDescriptor):
     28
    1292012-03-21  Yuta Kitamura  <yutak@chromium.org>
    230

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

    r110735 r111577  
    7070String IceCandidate::toSdp()
    7171{
    72     return m_descriptor->toSdp();
     72    return m_descriptor->toSDP();
    7373}
    7474

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

    r110943 r111577  
    6868String SessionDescription::toSdp()
    6969{
    70     return m_descriptor->toSdp();
     70    return m_descriptor->toSDP();
    7171}
    7272

  • trunk/Source/WebCore/platform/mediastream/IceCandidateDescriptor.cpp

    r110735 r111577  
    5454}
    5555
    56 String IceCandidateDescriptor::toSdp()
     56String IceCandidateDescriptor::toSDP()
    5757{
    58     return MediaStreamCenter::instance().constructSdp(this);
     58    return MediaStreamCenter::instance().constructSDP(this);
    5959}
    6060

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

    r110735 r111577  
    4848    const String& candidateLine() { return m_candidateLine; }
    4949
    50     String toSdp();
     50    String toSDP();
    5151
    5252private:

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

    r111258 r111577  
    5959}
    6060
    61 String MediaStreamCenter::constructSdp(IceCandidateDescriptor*)
     61String MediaStreamCenter::constructSDP(IceCandidateDescriptor*)
    6262{
    6363    return "";
    6464}
    6565
    66 String MediaStreamCenter::constructSdp(SessionDescriptionDescriptor*)
     66String MediaStreamCenter::constructSDP(SessionDescriptionDescriptor*)
    6767{
    6868    return "";

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

    r110943 r111577  
    7878    void didConstructMediaStream(MediaStreamDescriptor*);
    7979
    80     String constructSdp(IceCandidateDescriptor*);
    81     String constructSdp(SessionDescriptionDescriptor*);
     80    String constructSDP(IceCandidateDescriptor*);
     81    String constructSDP(SessionDescriptionDescriptor*);
    8282
    8383    // Calls from the platform to update the DOM objects

  • trunk/Source/WebCore/platform/mediastream/SessionDescriptionDescriptor.cpp

    r110943 r111577  
    4646
    4747SessionDescriptionDescriptor::SessionDescriptionDescriptor(const String& sdp)
    48     : m_initialSdp(sdp)
     48    : m_initialSDP(sdp)
    4949{
    5050}
    … …  
    5959}
    6060
    61 String SessionDescriptionDescriptor::toSdp()
     61String SessionDescriptionDescriptor::toSDP()
    6262{
    63     return MediaStreamCenter::instance().constructSdp(this);
     63    return MediaStreamCenter::instance().constructSDP(this);
    6464}
    6565
    … …  
    7474}
    7575
    76 const String& SessionDescriptionDescriptor::initialSdp()
     76const String& SessionDescriptionDescriptor::initialSDP()
    7777{
    78     return m_initialSdp;
     78    return m_initialSDP;
    7979}
    8080

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

    r111007 r111577  
    4848
    4949    void addCandidate(PassRefPtr<IceCandidateDescriptor>);
    50     String toSdp();
     50    String toSDP();
    5151
    5252    size_t numberOfAddedCandidates() const;
    5353    IceCandidateDescriptor* candidate(size_t index) const;
    54     const String& initialSdp();
     54    const String& initialSDP();
    5555
    5656private:
    5757    explicit SessionDescriptionDescriptor(const String& sdp);
    5858
    59     String m_initialSdp;
     59    String m_initialSDP;
    6060    Vector<RefPtr<IceCandidateDescriptor> > m_candidates;
    6161};

  • trunk/Source/WebKit/chromium/ChangeLog

    r111555 r111577  
     12012-03-21  Tommy Widenflycht  <tommyw@google.com>
     2
     3        [chromium] MediaStream API (JSEP): Introducing WebSessionDescription and WebIceCandidate
     4        https://bugs.webkit.org/show_bug.cgi?id=81339
     5
     6        Reviewed by Adam Barth.
     7
     8        Simple WebKit representations of the WebCore/platform versions.
     9
     10        * WebKit.gyp:
     11        * public/platform/WebICECandidateDescriptor.h: Added.
     12        (WebCore):
     13        (WebKit):
     14        (WebICECandidateDescriptor):
     15        (WebKit::WebICECandidateDescriptor::WebICECandidateDescriptor):
     16        (WebKit::WebICECandidateDescriptor::~WebICECandidateDescriptor):
     17        (WebKit::WebICECandidateDescriptor::operator=):
     18        (WebKit::WebICECandidateDescriptor::isNull):
     19        * public/platform/WebSessionDescriptionDescriptor.h: Added.
     20        (WebCore):
     21        (WebKit):
     22        (WebSessionDescriptionDescriptor):
     23        (WebKit::WebSessionDescriptionDescriptor::WebSessionDescriptionDescriptor):
     24        (WebKit::WebSessionDescriptionDescriptor::~WebSessionDescriptionDescriptor):
     25        (WebKit::WebSessionDescriptionDescriptor::operator=):
     26        (WebKit::WebSessionDescriptionDescriptor::isNull):
     27        * src/WebICECandidateDescriptor.cpp: Added.
     28        (WebKit):
     29        (WebKit::WebICECandidateDescriptor::WebICECandidateDescriptor):
     30        (WebKit::WebICECandidateDescriptor::assign):
     31        (WebKit::WebICECandidateDescriptor::reset):
     32        (WebKit::WebICECandidateDescriptor::initialize):
     33        (WebKit::WebICECandidateDescriptor::operator PassRefPtr<WebCore::IceCandidateDescriptor>):
     34        (WebKit::WebICECandidateDescriptor::label):
     35        (WebKit::WebICECandidateDescriptor::candidateLine):
     36        * src/WebSessionDescriptionDescriptor.cpp: Added.
     37        (WebKit):
     38        (WebKit::WebSessionDescriptionDescriptor::WebSessionDescriptionDescriptor):
     39        (WebKit::WebSessionDescriptionDescriptor::assign):
     40        (WebKit::WebSessionDescriptionDescriptor::reset):
     41        (WebKit::WebSessionDescriptionDescriptor::operator WTF::PassRefPtr<WebCore::SessionDescriptionDescriptor>):
     42        (WebKit::WebSessionDescriptionDescriptor::initialize):
     43        (WebKit::WebSessionDescriptionDescriptor::numberOfAddedCandidates):
     44        (WebKit::WebSessionDescriptionDescriptor::candidate):
     45        (WebKit::WebSessionDescriptionDescriptor::initialSDP):
     46
    1472012-03-21  Sami Kyostila  <skyostil@chromium.org>
    248

  • trunk/Source/WebKit/chromium/WebKit.gyp

    r111552 r111577  
    174174                'public/WebGlyphCache.h',
    175175                'public/WebHistoryItem.h',
     176                'public/WebICECandidateDescriptor.h',
    176177                'public/WebICEOptions.h',
    177178                'public/WebIDBCallbacks.h',
    … …  
    248249                'public/WebSecurityPolicy.h',
    249250                'public/WebSelectElement.h',
     251                'public/WebSessionDescriptionDescriptor.h',
    250252                'public/WebSettings.h',
    251253                'public/WebSharedWorkerClient.h',
    … …  
    563565                'src/WebHTTPBody.cpp',
    564566                'src/WebHTTPLoadInfo.cpp',
     567                'src/WebICECandidateDescriptor.cpp',
    565568                'src/WebICEOptions.cpp',
    566569                'src/WebIconLoadingCompletionImpl.cpp',
    … …  
    651654                'src/WebSelectElement.cpp',
    652655                'src/WebSerializedScriptValue.cpp',
     656                'src/WebSessionDescriptionDescriptor.cpp',
    653657                'src/WebSettingsImpl.cpp',
    654658                'src/WebSettingsImpl.h',
Note: See TracChangeset for help on using the changeset viewer.