Changeset 165248 in webkit


Ignore:
Timestamp:
Mar 6, 2014 9:42:57 PM (10 years ago)
Author:
thiago.lacerda@openbossa.org
Message:

[WebRTC] Updating RTCPeerConnection.idl
​https://bugs.webkit.org/show_bug.cgi?id=129804

Reviewed by Eric Carlson.

Some methods signatures were wrong, marking some arguments as optional when they are mandatory.

Source/WebCore:

Existing tests were updated.

  • Modules/mediastream/RTCPeerConnection.cpp:

(WebCore::RTCPeerConnection::getStats):

  • Modules/mediastream/RTCPeerConnection.h:
  • Modules/mediastream/RTCPeerConnection.idl:
  • Modules/mediastream/RTCStatsRequestImpl.cpp:

(WebCore::RTCStatsRequestImpl::create):
(WebCore::RTCStatsRequestImpl::RTCStatsRequestImpl):
(WebCore::RTCStatsRequestImpl::requestFailed):

  • Modules/mediastream/RTCStatsRequestImpl.h:
  • platform/mediastream/RTCStatsRequest.h:

LayoutTests:

  • fast/mediastream/RTCPeerConnection-stats.html:
  • fast/mediastream/RTCPeerConnection-statsSelector.html:
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r165243 r165248  
     12014-03-06  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
     2
     3        [WebRTC] Updating RTCPeerConnection.idl
     4        https://bugs.webkit.org/show_bug.cgi?id=129804
     5
     6        Reviewed by Eric Carlson.
     7
     8        Some methods signatures were wrong, marking some arguments as optional when they are mandatory.
     9
     10        * fast/mediastream/RTCPeerConnection-stats.html:
     11        * fast/mediastream/RTCPeerConnection-statsSelector.html:
     12
    1132014-03-06  Andy Estes  <aestes@apple.com>
    214

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-stats.html

    r164602 r165248  
    4141
    4242                pc.addStream(stream);
    43                 shouldNotThrow('pc.getStats(statsHandler2)');
     43                // FIXME: Test getStats error callback: https://webkit.org/b/129860
     44                shouldNotThrow('pc.getStats(statsHandler2, statsError)');
    4445            }
    4546
    … …  
    7273            }
    7374
     75            function statsError()
     76            {
     77                testFailed("Error in getStats.")
     78                finishJSTest();
     79            }
     80
    7481            var startTime = new Date().getTime();
    7582            shouldNotThrow("pc = new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]})");
    76             shouldNotThrow('pc.getStats(statsHandler1)');
     83            // FIXME: Test getStats error callback: https://webkit.org/b/129860
     84            shouldNotThrow('pc.getStats(statsHandler1, statsError)');
    7785
    7886            window.jsTestIsAsync = true;

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-statsSelector.html

    r164602 r165248  
    1212            var timestamp;
    1313            var local;
     14
     15            function statsError()
     16            {
     17                testFailed("Error in getStats.")
     18                finishJSTest();
     19            }
    1420
    1521            function getUserMedia(dictionary, callback) {
    … …  
    3238
    3339                pc.addStream(stream);
    34                 shouldNotThrow('pc.getStats(statsHandler2, pc.getLocalStreams()[0].getVideoTracks()[0])');
     40                // FIXME: Test getStats error callback: https://webkit.org/b/129860
     41                shouldNotThrow('pc.getStats(statsHandler2, statsError, pc.getLocalStreams()[0].getVideoTracks()[0])');
    3542            }
    3643

  • trunk/Source/WebCore/ChangeLog

    r165247 r165248  
     12014-03-06  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
     2
     3        [WebRTC] Updating RTCPeerConnection.idl
     4        https://bugs.webkit.org/show_bug.cgi?id=129804
     5
     6        Reviewed by Eric Carlson.
     7
     8        Some methods signatures were wrong, marking some arguments as optional when they are mandatory.
     9
     10        Existing tests were updated.
     11
     12        * Modules/mediastream/RTCPeerConnection.cpp:
     13        (WebCore::RTCPeerConnection::getStats):
     14        * Modules/mediastream/RTCPeerConnection.h:
     15        * Modules/mediastream/RTCPeerConnection.idl:
     16        * Modules/mediastream/RTCStatsRequestImpl.cpp:
     17        (WebCore::RTCStatsRequestImpl::create):
     18        (WebCore::RTCStatsRequestImpl::RTCStatsRequestImpl):
     19        (WebCore::RTCStatsRequestImpl::requestFailed):
     20        * Modules/mediastream/RTCStatsRequestImpl.h:
     21        * platform/mediastream/RTCStatsRequest.h:
     22
    1232014-03-06  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
    224

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

    r165247 r165248  
    522522}
    523523
    524 void RTCPeerConnection::getStats(PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<MediaStreamTrack> selector)
    525 {
    526     RefPtr<RTCStatsRequestImpl> statsRequest = RTCStatsRequestImpl::create(scriptExecutionContext(), successCallback, selector);
     524void RTCPeerConnection::getStats(PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, PassRefPtr<MediaStreamTrack> selector)
     525{
     526    RefPtr<RTCStatsRequestImpl> statsRequest = RTCStatsRequestImpl::create(scriptExecutionContext(), successCallback, errorCallback, selector);
    527527    // FIXME: Add passing selector as part of the statsRequest.
    528528    m_peerHandler->getStats(statsRequest.release());

  • trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h

    r165226 r165248  
    9494    void removeStream(PassRefPtr<MediaStream>, ExceptionCode&);
    9595
    96     void getStats(PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<MediaStreamTrack> selector);
     96    void getStats(PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback>, PassRefPtr<MediaStreamTrack> selector);
    9797
    9898    PassRefPtr<RTCDataChannel> createDataChannel(String label, const Dictionary& dataChannelDict, ExceptionCode&);

  • trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl

    r165226 r165248  
    4040    InterfaceName=webkitRTCPeerConnection,
    4141] interface RTCPeerConnection {
    42     [RaisesException] void createOffer(RTCSessionDescriptionCallback successCallback, [Default=Undefined] optional RTCPeerConnectionErrorCallback failureCallback, optional Dictionary offerOptions);
     42    [RaisesException] void createOffer(RTCSessionDescriptionCallback successCallback, RTCPeerConnectionErrorCallback failureCallback, optional Dictionary offerOptions);
    4343
    44     [RaisesException] void createAnswer(RTCSessionDescriptionCallback successCallback, [Default=Undefined] optional RTCPeerConnectionErrorCallback failureCallback, optional Dictionary answerOptions);
     44    [RaisesException] void createAnswer(RTCSessionDescriptionCallback successCallback, RTCPeerConnectionErrorCallback failureCallback, optional Dictionary answerOptions);
    4545
    46     [RaisesException] void setLocalDescription(RTCSessionDescription description, [Default=Undefined] optional VoidCallback successCallback, [Default=Undefined] optional RTCPeerConnectionErrorCallback failureCallback);
     46    [RaisesException] void setLocalDescription(RTCSessionDescription description, VoidCallback successCallback, RTCPeerConnectionErrorCallback failureCallback);
    4747    [GetterRaisesException] readonly attribute RTCSessionDescription localDescription;
    4848
    49     [RaisesException] void setRemoteDescription(RTCSessionDescription description, [Default=Undefined] optional VoidCallback successCallback, [Default=Undefined] optional RTCPeerConnectionErrorCallback failureCallback);
     49    [RaisesException] void setRemoteDescription(RTCSessionDescription description, VoidCallback successCallback, RTCPeerConnectionErrorCallback failureCallback);
    5050    [GetterRaisesException] readonly attribute RTCSessionDescription remoteDescription;
    5151
    5252    readonly attribute DOMString signalingState;
    5353
    54     [RaisesException] void updateIce(optional Dictionary configuration);
     54    [RaisesException] void updateIce(Dictionary configuration);
    5555
    5656    [RaisesException] void addIceCandidate(RTCIceCandidate candidate, VoidCallback successCallback, RTCPeerConnectionErrorCallback failureCallback);
    … …  
    6666    [StrictTypeChecking, RaisesException] void removeStream(MediaStream stream);
    6767
    68     void getStats(RTCStatsCallback successCallback, [Default=Undefined] optional MediaStreamTrack selector);
     68    void getStats(RTCStatsCallback successCallback, RTCPeerConnectionErrorCallback failureCallback, [Default=Undefined] optional MediaStreamTrack selector);
    6969
    7070    [RaisesException] RTCDataChannel createDataChannel([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString label, optional Dictionary options);

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

    r156574 r165248  
    3030
    3131#include "MediaStreamTrack.h"
     32#include "RTCPeerConnectionErrorCallback.h"
    3233#include "RTCStatsCallback.h"
    3334#include "RTCStatsRequest.h"
    … …  
    3637namespace WebCore {
    3738
    38 PassRefPtr<RTCStatsRequestImpl> RTCStatsRequestImpl::create(ScriptExecutionContext* context, PassRefPtr<RTCStatsCallback> callback, PassRefPtr<MediaStreamTrack> selector)
     39PassRefPtr<RTCStatsRequestImpl> RTCStatsRequestImpl::create(ScriptExecutionContext* context, PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, PassRefPtr<MediaStreamTrack> selector)
    3940{
    40     RefPtr<RTCStatsRequestImpl> request = adoptRef(new RTCStatsRequestImpl(context, callback, selector));
     41    RefPtr<RTCStatsRequestImpl> request = adoptRef(new RTCStatsRequestImpl(context, successCallback, errorCallback, selector));
    4142    request->suspendIfNeeded();
    4243    return request.release();
    4344}
    4445
    45 RTCStatsRequestImpl::RTCStatsRequestImpl(ScriptExecutionContext* context, PassRefPtr<RTCStatsCallback> callback, PassRefPtr<MediaStreamTrack> selector)
     46RTCStatsRequestImpl::RTCStatsRequestImpl(ScriptExecutionContext* context, PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, PassRefPtr<MediaStreamTrack> selector)
    4647    : ActiveDOMObject(context)
    47     , m_successCallback(callback)
     48    , m_successCallback(successCallback)
     49    , m_errorCallback(errorCallback)
    4850    , m_track(selector)
    4951{
    … …  
    7779}
    7880
     81void RTCStatsRequestImpl::requestFailed(const String& error)
     82{
     83    if (m_errorCallback)
     84        m_errorCallback->handleEvent(DOMError::create(error).get());
     85
     86    clear();
     87}
     88
    7989void RTCStatsRequestImpl::stop()
    8090{

  • trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.h

    r162139 r165248  
    3838
    3939class RTCStatsCallback;
     40class RTCPeerConnectionErrorCallback;
    4041
    4142class RTCStatsRequestImpl : public RTCStatsRequest, public ActiveDOMObject {
    4243public:
    43     static PassRefPtr<RTCStatsRequestImpl> create(ScriptExecutionContext*, PassRefPtr<RTCStatsCallback>, PassRefPtr<MediaStreamTrack>);
     44    static PassRefPtr<RTCStatsRequestImpl> create(ScriptExecutionContext*, PassRefPtr<RTCStatsCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, PassRefPtr<MediaStreamTrack>);
    4445    virtual ~RTCStatsRequestImpl();
    4546
    … …  
    4950
    5051    virtual void requestSucceeded(PassRefPtr<RTCStatsResponseBase>) override;
     52    virtual void requestFailed(const String&) override;
    5153
    5254    // ActiveDOMObject
    … …  
    5456
    5557private:
    56     RTCStatsRequestImpl(ScriptExecutionContext*, PassRefPtr<RTCStatsCallback>, PassRefPtr<MediaStreamTrack>);
     58    RTCStatsRequestImpl(ScriptExecutionContext*, PassRefPtr<RTCStatsCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, PassRefPtr<MediaStreamTrack>);
    5759
    5860    void clear();
    5961
    6062    RefPtr<RTCStatsCallback> m_successCallback;
     63    RefPtr<RTCPeerConnectionErrorCallback> m_errorCallback;
    6164    RefPtr<MediaStreamTrack> m_track;
    6265};

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

    r156574 r165248  
    5151    virtual MediaStreamTrack* track() = 0;
    5252    virtual void requestSucceeded(PassRefPtr<RTCStatsResponseBase>) = 0;
     53    virtual void requestFailed(const String&) = 0;
    5354
    5455protected:
Note: See TracChangeset for help on using the changeset viewer.