Changeset 165226 in webkit


Ignore:
Timestamp:
Mar 6, 2014 3:41:24 PM (10 years ago)
Author:
thiago.lacerda@openbossa.org
Message:

[WebRTC] Updating createOffer and createAnswer methods to match WebRTC editor's draft of 01/27/2014
https://bugs.webkit.org/show_bug.cgi?id=129484

Reviewed by Eric Carlson.

According to the spec, createOffer and createAnswer will no longer have MediaConstraints as an argument,
instead they will have RTCOfferOptions and RTCOfferAnswerOptions, respectively.

Source/WebCore:

Existing tests were updated.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • Modules/mediastream/RTCOfferAnswerOptions.cpp: Added.
  • Modules/mediastream/RTCOfferAnswerOptions.h: Added.
  • Modules/mediastream/RTCPeerConnection.cpp:

(WebCore::RTCPeerConnection::createOffer):
(WebCore::RTCPeerConnection::createAnswer):

  • Modules/mediastream/RTCPeerConnection.h:
  • Modules/mediastream/RTCPeerConnection.idl:
  • platform/mediastream/RTCPeerConnectionHandler.h:
  • platform/mock/RTCPeerConnectionHandlerMock.cpp:

(WebCore::RTCPeerConnectionHandlerMock::createOffer):
(WebCore::RTCPeerConnectionHandlerMock::createAnswer):

  • platform/mock/RTCPeerConnectionHandlerMock.h:

LayoutTests:

  • fast/mediastream/RTCPeerConnection-createAnswer-expected.txt:
  • fast/mediastream/RTCPeerConnection-createAnswer.html:
  • fast/mediastream/RTCPeerConnection-createOffer-expected.txt:
  • fast/mediastream/RTCPeerConnection-createOffer.html:
Location:
trunk
Files:
2 added
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r165208 r165226  
     12014-03-06  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
     2
     3        [WebRTC] Updating createOffer and createAnswer methods to match WebRTC editor's draft of 01/27/2014
     4        https://bugs.webkit.org/show_bug.cgi?id=129484
     5
     6        Reviewed by Eric Carlson.
     7
     8        According to the spec, createOffer and createAnswer will no longer have MediaConstraints as an argument,
     9        instead they will have RTCOfferOptions and RTCOfferAnswerOptions, respectively.
     10
     11        * fast/mediastream/RTCPeerConnection-createAnswer-expected.txt:
     12        * fast/mediastream/RTCPeerConnection-createAnswer.html:
     13        * fast/mediastream/RTCPeerConnection-createOffer-expected.txt:
     14        * fast/mediastream/RTCPeerConnection-createOffer.html:
     15
    1162014-03-05  Oliver Hunt  <oliver@apple.com>
    217
  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer-expected.txt

    r160553 r165226  
    88PASS pc.setRemoteDescription(sessionDescription, setDescriptionSucceeded, setDescriptionFailed); did not throw exception.
    99PASS setRemoteDescription succeeded.
    10 PASS pc.createAnswer(requestSucceeded2, requestFailed2, {mandatory:{"succeed":false}}); did not throw exception.
     10PASS pc.createAnswer(requestSucceeded2, requestFailed2, {}); threw exception Error: TypeMismatchError: DOM Exception 17.
    1111PASS createAnswer request failed.
    12 PASS errorReason.name is "IncompatibleConstraintsError"
    13 PASS pc.createAnswer(requestSucceeded3, requestFailed3); did not throw exception.
    14 PASS createAnswer request succeeded.
    15 PASS sessionDescription.type is "answer"
    16 PASS pc.createAnswer(requestSucceeded4, requestFailed3, {mandatory:{"succeed":true}}); did not throw exception.
    17 PASS createAnswer request succeeded.
    18 PASS sessionDescription.type is "answer"
     12PASS errorReason.name is "Invalid createAnswer argument."
     13PASS pc.createAnswer(requestSucceeded3, requestFailed1, {requestIdentity:"ifconfigured"}); did not throw exception.
    1914PASS successfullyParsed is true
    2015
  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer.html

    r164602 r165226  
    1010            var pc = null;
    1111
    12             function requestSucceeded4(sd)
     12            function requestSucceeded5(sd)
    1313            {
    1414                testPassed('createAnswer request succeeded.');
     
    2020            }
    2121
    22             function requestFailed3(reason)
    23             {
    24                 testFailed('createAnswer request failed.');
    25 
    26                 finishJSTest();
    27             }
    28 
    29             function requestSucceeded3(sd)
     22            function requestSucceeded4(sd)
    3023            {
    3124                testPassed('createAnswer request succeeded.');
     
    3427                shouldBe('sessionDescription.type', '"answer"');
    3528
    36                 shouldNotThrow('pc.createAnswer(requestSucceeded4, requestFailed3, {mandatory:{"succeed":true}});');
     29                shouldNotThrow('pc.createAnswer(requestSucceeded5, requestFailed1, {requestIdentity:"no"});');
     30            }
     31
     32            function requestSucceeded3(sd)
     33            {
     34                finishJSTest();
     35                testPassed('createAnswer request succeeded.');
     36
     37                sessionDescription = sd;
     38                shouldBe('sessionDescription.type', '"answer"');
     39
     40                shouldNotThrow('pc.createAnswer(requestSucceeded4, requestFailed1, {requestIdentity:"yes"});');
    3741            }
    3842
     
    4246
    4347                errorReason = reason;
    44                 shouldBe('errorReason.name', '"IncompatibleConstraintsError"');
    45 
    46                 shouldNotThrow('pc.createAnswer(requestSucceeded3, requestFailed3);');
     48                shouldBe('errorReason.name', '"Invalid createAnswer argument."');
     49                shouldNotThrow('pc.createAnswer(requestSucceeded3, requestFailed1, {requestIdentity:"ifconfigured"});');
    4750            }
    4851
     
    7982            {
    8083                testPassed('setRemoteDescription succeeded.');
    81                 shouldNotThrow('pc.createAnswer(requestSucceeded2, requestFailed2, {mandatory:{"succeed":false}});');
     84                shouldThrow('pc.createAnswer(requestSucceeded2, requestFailed2, {});');
    8285            }
    8386
  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer-expected.txt

    r160553 r165226  
    44
    55
    6 PASS pc.createOffer(requestSucceeded1, requestFailed1, {mandatory:{"succeed":true}}); did not throw exception.
     6PASS pc.createOffer(requestSucceeded1, requestFailed1); did not throw exception.
    77PASS createOffer request succeeded.
    88PASS sessionDescription.type is "offer"
    9 PASS pc.createOffer(requestSucceeded2, requestFailed2, {mandatory:{"succeed":false}}); did not throw exception.
     9PASS pc.createOffer(requestSucceeded2, requestFailed2, {}); threw exception Error: TypeMismatchError: DOM Exception 17.
    1010PASS createOffer request failed.
    11 PASS errorReason.name is "IncompatibleConstraintsError"
    12 PASS pc.createOffer(requestSucceeded3, requestFailed1); did not throw exception.
     11PASS errorReason.name is "Invalid createOffer argument."
     12PASS pc.createOffer(requestSucceeded2, requestFailed3, {requestIdentity:"yes", offerToReceiveAudio:0}); threw exception Error: TypeMismatchError: DOM Exception 17.
     13PASS createOffer request failed.
     14PASS errorReason.name is "Invalid createOffer argument."
     15PASS pc.createOffer(requestSucceeded2, requestFailed4, {requestIdentity:"yes", offerToReceiveVideo:0}); threw exception Error: TypeMismatchError: DOM Exception 17.
     16PASS createOffer request failed.
     17PASS errorReason.name is "Invalid createOffer argument."
     18PASS pc.createOffer(requestSucceeded2, requestFailed5, {offerToReceiveVideo:0, offerToReceiveAudio:0}); threw exception Error: TypeMismatchError: DOM Exception 17.
     19PASS createOffer request failed.
     20PASS errorReason.name is "Invalid createOffer argument."
     21PASS pc.createOffer(requestSucceeded2, requestFailed6, {requestIdentity:"yes", offerToReceiveVideo:"", offerToReceiveAudio:0}); threw exception Error: TypeMismatchError: DOM Exception 17.
     22PASS createOffer request failed.
     23PASS errorReason.name is "Invalid createOffer argument."
     24PASS pc.createOffer(requestSucceeded2, requestFailed7, {requestIdentity:"yes", offerToReceiveVideo:0, offerToReceiveAudio:""}); threw exception Error: TypeMismatchError: DOM Exception 17.
     25PASS createOffer request failed.
     26PASS errorReason.name is "Invalid createOffer argument."
     27PASS pc.createOffer(requestSucceeded3, requestFailed1, {requestIdentity:"yes", offerToReceiveVideo:0, offerToReceiveAudio:0}); did not throw exception.
    1328PASS createOffer request succeeded.
    1429PASS sessionDescription.type is "offer"
  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer.html

    r164602 r165226  
    1919            }
    2020
     21            function requestFailed7(reason)
     22            {
     23                testPassed('createOffer request failed.');
     24
     25                errorReason = reason;
     26                shouldBe('errorReason.name', '"Invalid createOffer argument."');
     27
     28                shouldNotThrow('pc.createOffer(requestSucceeded3, requestFailed1, {requestIdentity:"yes", offerToReceiveVideo:0, offerToReceiveAudio:0});');
     29            }
     30
     31            function requestFailed6(reason)
     32            {
     33                testPassed('createOffer request failed.');
     34
     35                errorReason = reason;
     36                shouldBe('errorReason.name', '"Invalid createOffer argument."');
     37
     38                shouldThrow('pc.createOffer(requestSucceeded2, requestFailed7, {requestIdentity:"yes", offerToReceiveVideo:0, offerToReceiveAudio:""});');
     39            }
     40
     41            function requestFailed5(reason)
     42            {
     43                testPassed('createOffer request failed.');
     44
     45                errorReason = reason;
     46                shouldBe('errorReason.name', '"Invalid createOffer argument."');
     47
     48                shouldThrow('pc.createOffer(requestSucceeded2, requestFailed6, {requestIdentity:"yes", offerToReceiveVideo:"", offerToReceiveAudio:0});');
     49            }
     50
     51            function requestFailed4(reason)
     52            {
     53                testPassed('createOffer request failed.');
     54
     55                errorReason = reason;
     56                shouldBe('errorReason.name', '"Invalid createOffer argument."');
     57
     58                shouldThrow('pc.createOffer(requestSucceeded2, requestFailed5, {offerToReceiveVideo:0, offerToReceiveAudio:0});');
     59            }
     60
     61            function requestFailed3(reason)
     62            {
     63                testPassed('createOffer request failed.');
     64
     65                errorReason = reason;
     66                shouldBe('errorReason.name', '"Invalid createOffer argument."');
     67
     68                shouldThrow('pc.createOffer(requestSucceeded2, requestFailed4, {requestIdentity:"yes", offerToReceiveVideo:0});');
     69            }
     70
    2171            function requestFailed2(reason)
    2272            {
     
    2474
    2575                errorReason = reason;
    26                 shouldBe('errorReason.name', '"IncompatibleConstraintsError"');
     76                shouldBe('errorReason.name', '"Invalid createOffer argument."');
    2777
    28                 shouldNotThrow('pc.createOffer(requestSucceeded3, requestFailed1);');
     78                shouldThrow('pc.createOffer(requestSucceeded2, requestFailed3, {requestIdentity:"yes", offerToReceiveAudio:0});');
    2979            }
    3080
     
    4898                shouldBe('sessionDescription.type', '"offer"');
    4999
    50                 shouldNotThrow('pc.createOffer(requestSucceeded2, requestFailed2, {mandatory:{"succeed":false}});');
     100                shouldThrow('pc.createOffer(requestSucceeded2, requestFailed2, {});');
    51101            }
    52102
    53103            pc = new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]});
    54             shouldNotThrow('pc.createOffer(requestSucceeded1, requestFailed1, {mandatory:{"succeed":true}});');
     104            shouldNotThrow('pc.createOffer(requestSucceeded1, requestFailed1);');
    55105
    56106            window.jsTestIsAsync = true;
  • trunk/Source/WebCore/CMakeLists.txt

    r165199 r165226  
    861861    Modules/mediastream/RTCIceCandidate.cpp
    862862    Modules/mediastream/RTCIceCandidateEvent.cpp
     863    Modules/mediastream/RTCOfferAnswerOptions.cpp
    863864    Modules/mediastream/RTCPeerConnection.cpp
    864865    Modules/mediastream/RTCSessionDescription.cpp
  • trunk/Source/WebCore/ChangeLog

    r165222 r165226  
     12014-03-06  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
     2
     3        [WebRTC] Updating createOffer and createAnswer methods to match WebRTC editor's draft of 01/27/2014
     4        https://bugs.webkit.org/show_bug.cgi?id=129484
     5
     6        Reviewed by Eric Carlson.
     7
     8        According to the spec, createOffer and createAnswer will no longer have MediaConstraints as an argument,
     9        instead they will have RTCOfferOptions and RTCOfferAnswerOptions, respectively.
     10
     11        Existing tests were updated.
     12
     13        * CMakeLists.txt:
     14        * GNUmakefile.list.am:
     15        * Modules/mediastream/RTCOfferAnswerOptions.cpp: Added.
     16        * Modules/mediastream/RTCOfferAnswerOptions.h: Added.
     17        * Modules/mediastream/RTCPeerConnection.cpp:
     18        (WebCore::RTCPeerConnection::createOffer):
     19        (WebCore::RTCPeerConnection::createAnswer):
     20        * Modules/mediastream/RTCPeerConnection.h:
     21        * Modules/mediastream/RTCPeerConnection.idl:
     22        * platform/mediastream/RTCPeerConnectionHandler.h:
     23        * platform/mock/RTCPeerConnectionHandlerMock.cpp:
     24        (WebCore::RTCPeerConnectionHandlerMock::createOffer):
     25        (WebCore::RTCPeerConnectionHandlerMock::createAnswer):
     26        * platform/mock/RTCPeerConnectionHandlerMock.h:
     27
    1282014-03-06  Brian Burg  <bburg@apple.com>
    229
  • trunk/Source/WebCore/GNUmakefile.list.am

    r165199 r165226  
    19461946        Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.cpp \
    19471947        Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.h \
     1948        Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.cpp \
     1949        Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.h \
    19481950        Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp \
    19491951        Source/WebCore/Modules/mediastream/RTCPeerConnection.h \
  • trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp

    r164839 r165226  
    4343#include "FrameLoader.h"
    4444#include "FrameLoaderClient.h"
    45 #include "MediaConstraintsImpl.h"
    4645#include "MediaStreamEvent.h"
    4746#include "RTCConfiguration.h"
     
    5352#include "RTCIceCandidateDescriptor.h"
    5453#include "RTCIceCandidateEvent.h"
     54#include "RTCOfferAnswerOptions.h"
    5555#include "RTCPeerConnectionErrorCallback.h"
    5656#include "RTCSessionDescription.h"
     
    204204}
    205205
    206 void RTCPeerConnection::createOffer(PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, const Dictionary& mediaConstraints, ExceptionCode& ec)
     206void RTCPeerConnection::createOffer(PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, const Dictionary& offerOptions, ExceptionCode& ec)
    207207{
    208208    if (m_signalingState == SignalingStateClosed) {
     
    216216    }
    217217
    218     RefPtr<MediaConstraints> constraints = MediaConstraintsImpl::create(mediaConstraints, ec);
    219     if (ec)
    220         return;
     218    RefPtr<RTCOfferOptions> options = RTCOfferOptions::create(offerOptions, ec);
     219    if (ec) {
     220        callOnMainThread([=] {
     221            RefPtr<DOMError> error = DOMError::create("Invalid createOffer argument.");
     222            errorCallback->handleEvent(error.get());
     223        });
     224        return;
     225    }
    221226
    222227    RefPtr<RTCSessionDescriptionRequestImpl> request = RTCSessionDescriptionRequestImpl::create(scriptExecutionContext(), successCallback, errorCallback);
    223     m_peerHandler->createOffer(request.release(), constraints);
    224 }
    225 
    226 void RTCPeerConnection::createAnswer(PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, const Dictionary& mediaConstraints, ExceptionCode& ec)
     228    m_peerHandler->createOffer(request.release(), options.release());
     229}
     230
     231void RTCPeerConnection::createAnswer(PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, const Dictionary& answerOptions, ExceptionCode& ec)
    227232{
    228233    if (m_signalingState == SignalingStateClosed) {
     
    236241    }
    237242
    238     RefPtr<MediaConstraints> constraints = MediaConstraintsImpl::create(mediaConstraints, ec);
    239     if (ec)
    240         return;
     243    RefPtr<RTCOfferAnswerOptions> options = RTCOfferAnswerOptions::create(answerOptions, ec);
     244    if (ec) {
     245        callOnMainThread([=] {
     246            RefPtr<DOMError> error = DOMError::create("Invalid createAnswer argument.");
     247            errorCallback->handleEvent(error.get());
     248        });
     249        return;
     250    }
    241251
    242252    RefPtr<RTCSessionDescriptionRequestImpl> request = RTCSessionDescriptionRequestImpl::create(scriptExecutionContext(), successCallback, errorCallback);
    243     m_peerHandler->createAnswer(request.release(), constraints.release());
     253    m_peerHandler->createAnswer(request.release(), options.release());
    244254}
    245255
  • trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h

    r164839 r165226  
    4949namespace WebCore {
    5050
    51 class MediaConstraints;
    5251class MediaStreamTrack;
    5352class RTCConfiguration;
     
    6564    ~RTCPeerConnection();
    6665
    67     void createOffer(PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, const Dictionary& mediaConstraints, ExceptionCode&);
     66    void createOffer(PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, const Dictionary& offerOptions, ExceptionCode&);
    6867
    69     void createAnswer(PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, const Dictionary& mediaConstraints, ExceptionCode&);
     68    void createAnswer(PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, const Dictionary& answerOptions, ExceptionCode&);
    7069
    7170    void setLocalDescription(PassRefPtr<RTCSessionDescription>, PassRefPtr<VoidCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, ExceptionCode&);
  • trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl

    r164839 r165226  
    4040    InterfaceName=webkitRTCPeerConnection,
    4141] interface RTCPeerConnection {
    42     [RaisesException] void createOffer(RTCSessionDescriptionCallback successCallback, [Default=Undefined] optional RTCPeerConnectionErrorCallback failureCallback, optional Dictionary mediaConstraints);
     42    [RaisesException] void createOffer(RTCSessionDescriptionCallback successCallback, [Default=Undefined] optional RTCPeerConnectionErrorCallback failureCallback, optional Dictionary offerOptions);
    4343
    44     [RaisesException] void createAnswer(RTCSessionDescriptionCallback successCallback, [Default=Undefined] optional RTCPeerConnectionErrorCallback failureCallback, optional Dictionary mediaConstraints);
     44    [RaisesException] void createAnswer(RTCSessionDescriptionCallback successCallback, [Default=Undefined] optional RTCPeerConnectionErrorCallback failureCallback, optional Dictionary answerOptions);
    4545
    4646    [RaisesException] void setLocalDescription(RTCSessionDescription description, [Default=Undefined] optional VoidCallback successCallback, [Default=Undefined] optional RTCPeerConnectionErrorCallback failureCallback);
  • trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h

    r164839 r165226  
    4040namespace WebCore {
    4141
    42 class MediaConstraints;
    4342class MediaStreamSource;
    4443class RTCConfiguration;
     
    4645class RTCDataChannelHandler;
    4746class RTCIceCandidateDescriptor;
     47class RTCOfferOptions;
     48class RTCOfferAnswerOptions;
    4849class RTCPeerConnectionHandler;
    4950class RTCPeerConnectionHandlerClient;
     
    8384    virtual bool initialize(PassRefPtr<RTCConfiguration>) = 0;
    8485
    85     virtual void createOffer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<MediaConstraints>) = 0;
    86     virtual void createAnswer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<MediaConstraints>) = 0;
     86    virtual void createOffer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<RTCOfferOptions>) = 0;
     87    virtual void createAnswer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<RTCOfferAnswerOptions>) = 0;
    8788    virtual void setLocalDescription(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCSessionDescriptionDescriptor>) = 0;
    8889    virtual void setRemoteDescription(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCSessionDescriptionDescriptor>) = 0;
  • trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp

    r164839 r165226  
    5959}
    6060
    61 void RTCPeerConnectionHandlerMock::createOffer(PassRefPtr<RTCSessionDescriptionRequest> request, PassRefPtr<MediaConstraints> constraints)
     61void RTCPeerConnectionHandlerMock::createOffer(PassRefPtr<RTCSessionDescriptionRequest> request, PassRefPtr<RTCOfferOptions>)
    6262{
    63     String succeedValue;
    64     RefPtr<SessionRequestNotifier> notifier;
    65     if (constraints->getMandatoryConstraintValue("succeed", succeedValue) && succeedValue == "false")
    66         notifier = adoptRef(new SessionRequestNotifier(request, 0, RTCPeerConnectionHandler::incompatibleConstraintsErrorName()));
    67     else
    68         notifier = adoptRef(new SessionRequestNotifier(request, RTCSessionDescriptionDescriptor::create("offer", "local")));
    69 
     63    RefPtr<SessionRequestNotifier> notifier = adoptRef(new SessionRequestNotifier(request, RTCSessionDescriptionDescriptor::create("offer", "local")));
    7064    m_timerEvents.append(adoptRef(new TimerEvent(this, notifier)));
    7165}
    7266
    73 void RTCPeerConnectionHandlerMock::createAnswer(PassRefPtr<RTCSessionDescriptionRequest> request, PassRefPtr<MediaConstraints> constraints)
     67void RTCPeerConnectionHandlerMock::createAnswer(PassRefPtr<RTCSessionDescriptionRequest> request, PassRefPtr<RTCOfferAnswerOptions>)
    7468{
    75     RefPtr<SessionRequestNotifier> notifier;
    76     // We can only create an answer if we have already had an offer and the remote session description is stored.
    77     String succeedValue;
    78     if (constraints->getMandatoryConstraintValue("succeed", succeedValue) && succeedValue == "false")
    79         notifier = adoptRef(new SessionRequestNotifier(request, 0, RTCPeerConnectionHandler::incompatibleConstraintsErrorName()));
    80     else
    81         notifier = adoptRef(new SessionRequestNotifier(request, RTCSessionDescriptionDescriptor::create("answer", "local")));
    82 
     69    RefPtr<SessionRequestNotifier> notifier = adoptRef(new SessionRequestNotifier(request, RTCSessionDescriptionDescriptor::create("answer", "local")));
    8370    m_timerEvents.append(adoptRef(new TimerEvent(this, notifier)));
    8471}
  • trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h

    r164839 r165226  
    4444    virtual bool initialize(PassRefPtr<RTCConfiguration>) override;
    4545
    46     virtual void createOffer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<MediaConstraints>) override;
    47     virtual void createAnswer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<MediaConstraints>) override;
     46    virtual void createOffer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<RTCOfferOptions>) override;
     47    virtual void createAnswer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<RTCOfferAnswerOptions>) override;
    4848    virtual void setLocalDescription(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCSessionDescriptionDescriptor>) override;
    4949    virtual void setRemoteDescription(PassRefPtr<RTCVoidRequest>, PassRefPtr<RTCSessionDescriptionDescriptor>) override;
Note: See TracChangeset for help on using the changeset viewer.