Enable SDPProcessor for Mac bots
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Oct 2016 16:46:23 +0000 (16:46 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Oct 2016 16:46:23 +0000 (16:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=163940

Patch by Youenn Fablet <youenn@apple.com> on 2016-10-26
Reviewed by Eric Carlson.

Source/WebCore:

Covered by activated tests.

Activating processing of SDPProcessor scripts for Mac bots.
Moving platform/mediastream/openwebrtc/SDPProcessorScriptResource.cpp to platform/mediastream/SDPProcessorScriptResource.cpp.
This file is not tied to openwebrtc and allows retrieving the SDPProcessor script resource file content.

* DerivedSources.make:
* PlatformGTK.cmake:
* WebCore.xcodeproj/project.pbxproj:
* platform/mediastream/SDPProcessorScriptResource.cpp:
(WebCore::SDPProcessorScriptResource::scriptString):
* platform/mediastream/openwebrtc/SDPProcessorScriptResource.cpp: Removed.

LayoutTests:

This is the first time the tests are activated since a long time.
Further patches should make the tests pass and/or update them according latest spec.

* fast/mediastream/RTCPeerConnection-createAnswer-expected.txt:
* fast/mediastream/RTCPeerConnection-createOffer-expected.txt:
* fast/mediastream/RTCPeerConnection-have-local-offer-expected.txt:
* fast/mediastream/RTCPeerConnection-have-local-pranswer-expected.txt:
* fast/mediastream/RTCPeerConnection-have-remote-offer-expected.txt:
* fast/mediastream/RTCPeerConnection-have-remote-pranswer-expected.txt:
* fast/mediastream/RTCPeerConnection-localDescription-expected.txt:
* fast/mediastream/RTCPeerConnection-remoteDescription-expected.txt:
* fast/mediastream/RTCPeerConnection-stable-expected.txt:
* platform/mac/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@207901 268f45cc-cd09-0410-ab3c-d52691b4dbfc

18 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer-expected.txt
LayoutTests/fast/mediastream/RTCPeerConnection-createOffer-expected.txt
LayoutTests/fast/mediastream/RTCPeerConnection-have-local-offer-expected.txt
LayoutTests/fast/mediastream/RTCPeerConnection-have-local-pranswer-expected.txt
LayoutTests/fast/mediastream/RTCPeerConnection-have-remote-offer-expected.txt
LayoutTests/fast/mediastream/RTCPeerConnection-have-remote-pranswer-expected.txt
LayoutTests/fast/mediastream/RTCPeerConnection-localDescription-expected.txt
LayoutTests/fast/mediastream/RTCPeerConnection-remoteDescription-expected.txt
LayoutTests/fast/mediastream/RTCPeerConnection-stable-expected.txt
LayoutTests/platform/mac/TestExpectations
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.make
Source/WebCore/PlatformGTK.cmake
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/mediastream/SDPProcessorScriptResource.cpp
Source/WebCore/platform/mediastream/openwebrtc/SDPProcessorScriptResource.cpp [deleted file]

index d249fc5..a1f2460 100644 (file)
@@ -1,3 +1,24 @@
+2016-10-26  Youenn Fablet  <youenn@apple.com>
+
+        Enable SDPProcessor for Mac bots
+        https://bugs.webkit.org/show_bug.cgi?id=163940
+
+        Reviewed by Eric Carlson.
+
+        This is the first time the tests are activated since a long time.
+        Further patches should make the tests pass and/or update them according latest spec.
+
+        * fast/mediastream/RTCPeerConnection-createAnswer-expected.txt:
+        * fast/mediastream/RTCPeerConnection-createOffer-expected.txt:
+        * fast/mediastream/RTCPeerConnection-have-local-offer-expected.txt:
+        * fast/mediastream/RTCPeerConnection-have-local-pranswer-expected.txt:
+        * fast/mediastream/RTCPeerConnection-have-remote-offer-expected.txt:
+        * fast/mediastream/RTCPeerConnection-have-remote-pranswer-expected.txt:
+        * fast/mediastream/RTCPeerConnection-localDescription-expected.txt:
+        * fast/mediastream/RTCPeerConnection-remoteDescription-expected.txt:
+        * fast/mediastream/RTCPeerConnection-stable-expected.txt:
+        * platform/mac/TestExpectations:
+
 2016-10-26  Nael Ouedraogo  <nael.ouedraogo@crf.canon.fr>
         WebRTC: The RTCTrackEventInit dictionary needs required members
         https://bugs.webkit.org/show_bug.cgi?id=158536
index d1ca09e..95ff8a5 100644 (file)
@@ -4,13 +4,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 PASS pc.createAnswer(requestSucceeded1, requestFailed1); did not throw exception.
-PASS createAnswer request succeeded.
-PASS pc.setRemoteDescription(sessionDescription, setDescriptionSucceeded, setDescriptionFailed); did not throw exception.
-PASS setRemoteDescription succeeded.
-PASS pc.createAnswer(requestSucceeded2, requestFailed2, {}); threw exception TypeMismatchError (DOM Exception 17): The type of an object was incompatible with the expected type of the parameter associated to the object..
-PASS createAnswer request failed.
-PASS errorReason.name is "Invalid createAnswer argument."
-PASS pc.createAnswer(requestSucceeded3, requestFailed1, {requestIdentity:"ifconfigured"}); did not throw exception.
+FAIL createAnswer request failed.
 PASS successfullyParsed is true
 
 TEST COMPLETE
index 91620b7..3739292 100644 (file)
@@ -6,27 +6,8 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 PASS pc.createOffer(requestSucceeded1, requestFailed1); did not throw exception.
 PASS createOffer request succeeded.
 PASS sessionDescription.type is "offer"
-PASS pc.createOffer(requestSucceeded2, requestFailed2, {}); threw exception TypeMismatchError (DOM Exception 17): The type of an object was incompatible with the expected type of the parameter associated to the object..
-PASS createOffer request failed.
-PASS errorReason.name is "Invalid createOffer argument."
-PASS pc.createOffer(requestSucceeded2, requestFailed3, {requestIdentity:"yes", offerToReceiveAudio:0}); threw exception TypeMismatchError (DOM Exception 17): The type of an object was incompatible with the expected type of the parameter associated to the object..
-PASS createOffer request failed.
-PASS errorReason.name is "Invalid createOffer argument."
-PASS pc.createOffer(requestSucceeded2, requestFailed4, {requestIdentity:"yes", offerToReceiveVideo:0}); threw exception TypeMismatchError (DOM Exception 17): The type of an object was incompatible with the expected type of the parameter associated to the object..
-PASS createOffer request failed.
-PASS errorReason.name is "Invalid createOffer argument."
-PASS pc.createOffer(requestSucceeded2, requestFailed5, {offerToReceiveVideo:0, offerToReceiveAudio:0}); threw exception TypeMismatchError (DOM Exception 17): The type of an object was incompatible with the expected type of the parameter associated to the object..
-PASS createOffer request failed.
-PASS errorReason.name is "Invalid createOffer argument."
-PASS pc.createOffer(requestSucceeded2, requestFailed6, {requestIdentity:"yes", offerToReceiveVideo:"", offerToReceiveAudio:0}); threw exception TypeMismatchError (DOM Exception 17): The type of an object was incompatible with the expected type of the parameter associated to the object..
-PASS createOffer request failed.
-PASS errorReason.name is "Invalid createOffer argument."
-PASS pc.createOffer(requestSucceeded2, requestFailed7, {requestIdentity:"yes", offerToReceiveVideo:0, offerToReceiveAudio:""}); threw exception TypeMismatchError (DOM Exception 17): The type of an object was incompatible with the expected type of the parameter associated to the object..
-PASS createOffer request failed.
-PASS errorReason.name is "Invalid createOffer argument."
-PASS pc.createOffer(requestSucceeded3, requestFailed1, {requestIdentity:"yes", offerToReceiveVideo:0, offerToReceiveAudio:0}); did not throw exception.
-PASS createOffer request succeeded.
-PASS sessionDescription.type is "offer"
+FAIL pc.createOffer(requestSucceeded2, requestFailed2, {}); should throw an exception. Was [object Promise].
+FAIL createOffer request succeeded.
 PASS successfullyParsed is true
 
 TEST COMPLETE
index 7b7b369..01b1b84 100644 (file)
@@ -5,61 +5,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 PASS pc.signalingState is "stable"
 PASS pc.setLocalDescription(sessionDescription, requestSucceeded1, finishIfFailed); did not throw exception.
-PASS setLocalDescription succeeded.
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.signalingState is "have-local-offer"
-PASS pc.setLocalDescription(sessionDescription, finishIfSucceeded, requestFailed1); did not throw exception.
-PASS setLocalDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.signalingState is "have-local-offer"
-PASS pc.setLocalDescription(sessionDescription, finishIfSucceeded, requestFailed2); did not throw exception.
-PASS setLocalDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.signalingState is "have-local-offer"
-PASS pc.setRemoteDescription(sessionDescription, finishIfSucceeded, requestFailed3); did not throw exception.
-PASS setRemoteDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.signalingState is "have-local-offer"
-PASS pc.setLocalDescription(sessionDescription, requestSucceeded2, finishIfFailed); did not throw exception.
-PASS setLocalDescription succeeded.
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.signalingState is "have-local-offer"
-PASS pc.setRemoteDescription(sessionDescription, requestSucceeded3, finishIfFailed); did not throw exception.
-PASS setRemoteDescription succeeded.
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "pranswer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-remote-pranswer"
-PASS pc.localDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.remoteDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.signalingState is "stable"
-PASS pc.setLocalDescription(sessionDescription, requestSucceeded4, finishIfFailed); did not throw exception.
-PASS setLocalDescription succeeded.
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.signalingState is "have-local-offer"
-PASS pc.setRemoteDescription(sessionDescription, requestSucceeded5, finishIfFailed); did not throw exception.
-PASS setRemoteDescription succeeded.
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "answer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "stable"
+FAIL setRemoteDescription failed.
 PASS successfullyParsed is true
 
 TEST COMPLETE
index de89f2f..1b011d1 100644 (file)
@@ -5,63 +5,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 PASS pc.signalingState is "stable"
 PASS pc.setRemoteDescription(sessionDescription, requestSucceeded1, finishIfFailed); did not throw exception.
-PASS setRemoteDescription succeeded.
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-remote-offer"
-PASS pc.setLocalDescription(sessionDescription, requestSucceeded2, finishIfFailed); did not throw exception.
-PASS setLocalDescription succeeded.
-PASS pc.localDescription.type is "pranswer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-local-pranswer"
-PASS pc.setLocalDescription(sessionDescription, requestSucceeded3, finishIfFailed); did not throw exception.
-PASS setLocalDescription succeeded.
-PASS pc.localDescription.type is "pranswer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-local-pranswer"
-PASS pc.setLocalDescription(sessionDescription, finishIfSucceeded, requestFailed1); did not throw exception.
-PASS setLocalDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription.type is "pranswer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-local-pranswer"
-PASS pc.setRemoteDescription(sessionDescription, finishIfSucceeded, requestFailed2); did not throw exception.
-PASS setRemoteDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription.type is "pranswer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-local-pranswer"
-PASS pc.setRemoteDescription(sessionDescription, finishIfSucceeded, requestFailed3); did not throw exception.
-PASS setRemoteDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription.type is "pranswer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-local-pranswer"
-PASS pc.setRemoteDescription(sessionDescription, finishIfSucceeded, requestFailed4); did not throw exception.
-PASS setRemoteDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription.type is "pranswer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-local-pranswer"
-PASS pc.setLocalDescription(sessionDescription, requestSucceeded4, finishIfFailed); did not throw exception.
-PASS setLocalDescription succeeded.
-PASS pc.localDescription.type is "answer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "stable"
+FAIL setRemoteDescription failed.
 PASS successfullyParsed is true
 
 TEST COMPLETE
index f9ac078..37c50e3 100644 (file)
@@ -5,61 +5,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 PASS pc.signalingState is "stable"
 PASS pc.setRemoteDescription(sessionDescription, requestSucceeded1, finishIfFailed); did not throw exception.
-PASS setRemoteDescription succeeded.
-PASS pc.localDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-remote-offer"
-PASS pc.setLocalDescription(sessionDescription, finishIfSucceeded, requestFailed1); did not throw exception.
-PASS setLocalDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-remote-offer"
-PASS pc.setRemoteDescription(sessionDescription, finishIfSucceeded, requestFailed2); did not throw exception.
-PASS setRemoteDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-remote-offer"
-PASS pc.setRemoteDescription(sessionDescription, finishIfSucceeded, requestFailed3); did not throw exception.
-PASS setRemoteDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-remote-offer"
-PASS pc.setRemoteDescription(sessionDescription, requestSucceeded2, finishIfFailed); did not throw exception.
-PASS setRemoteDescription succeeded.
-PASS pc.localDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-remote-offer"
-PASS pc.setLocalDescription(sessionDescription, requestSucceeded3, finishIfFailed); did not throw exception.
-PASS setLocalDescription succeeded.
-PASS pc.localDescription.type is "answer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "stable"
-PASS pc.localDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.remoteDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.signalingState is "stable"
-PASS pc.setRemoteDescription(sessionDescription, requestSucceeded4, finishIfFailed); did not throw exception.
-PASS setRemoteDescription succeeded.
-PASS pc.localDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-remote-offer"
-PASS pc.setLocalDescription(sessionDescription, requestSucceeded5, finishIfFailed); did not throw exception.
-PASS setLocalDescription succeeded.
-PASS pc.localDescription.type is "pranswer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-local-pranswer"
+FAIL setRemoteDescription failed.
 PASS successfullyParsed is true
 
 TEST COMPLETE
index 88770c5..1cfd6bd 100644 (file)
@@ -5,63 +5,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 PASS pc.signalingState is "stable"
 PASS pc.setLocalDescription(sessionDescription, requestSucceeded1, finishIfFailed); did not throw exception.
-PASS setLocalDescription succeeded.
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.signalingState is "have-local-offer"
-PASS pc.setRemoteDescription(sessionDescription, requestSucceeded2, finishIfFailed); did not throw exception.
-PASS setRemoteDescription succeeded.
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "pranswer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-remote-pranswer"
-PASS pc.setRemoteDescription(sessionDescription, requestSucceeded3, finishIfFailed); did not throw exception.
-PASS setRemoteDescription succeeded.
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "pranswer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-remote-pranswer"
-PASS pc.setRemoteDescription(sessionDescription, finishIfSucceeded, requestFailed1); did not throw exception.
-PASS setRemoteDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "pranswer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-remote-pranswer"
-PASS pc.setLocalDescription(sessionDescription, finishIfSucceeded, requestFailed2); did not throw exception.
-PASS setLocalDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "pranswer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-remote-pranswer"
-PASS pc.setLocalDescription(sessionDescription, finishIfSucceeded, requestFailed3); did not throw exception.
-PASS setLocalDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "pranswer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-remote-pranswer"
-PASS pc.setLocalDescription(sessionDescription, finishIfSucceeded, requestFailed4); did not throw exception.
-PASS setLocalDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "pranswer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-remote-pranswer"
-PASS pc.setRemoteDescription(sessionDescription, requestSucceeded4, finishIfFailed); did not throw exception.
-PASS setRemoteDescription succeeded.
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription.type is "answer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "stable"
+FAIL setRemoteDescription failed.
 PASS successfullyParsed is true
 
 TEST COMPLETE
index 0809fb8..6302751 100644 (file)
@@ -4,13 +4,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 PASS pc.setLocalDescription(sessionDescription, requestSucceeded1, requestFailed1); did not throw exception.
-PASS requestSucceeded was called.
-PASS pc.setLocalDescription(sessionDescription, requestSucceeded2, requestFailed2); did not throw exception.
-PASS requestFailed was called.
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
+FAIL requestFailed was called.
 PASS successfullyParsed is true
 
 TEST COMPLETE
index 227aaa9..462512f 100644 (file)
@@ -4,13 +4,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 PASS pc.setRemoteDescription(sessionDescription, requestSucceeded1, requestFailed1); did not throw exception.
-PASS requestSucceeded was called.
-PASS pc.setRemoteDescription(sessionDescription, requestSucceeded2, requestFailed2); did not throw exception.
-PASS requestFailed was called.
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
+FAIL requestFailed was called.
 PASS successfullyParsed is true
 
 TEST COMPLETE
index c775739..7c01403 100644 (file)
@@ -6,43 +6,30 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 PASS pc.signalingState is "stable"
 PASS pc.setLocalDescription(sessionDescription, finishIfSucceeded, requestFailed1); did not throw exception.
 PASS setLocalDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.remoteDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
+FAIL errorReason.name should be InvalidSessionDescriptionError. Was InvalidAccessError.
+FAIL pc.localDescription should throw an exception. Was null.
+FAIL pc.remoteDescription should throw an exception. Was null.
 PASS pc.signalingState is "stable"
 PASS pc.setLocalDescription(sessionDescription, finishIfSucceeded, requestFailed2); did not throw exception.
 PASS setLocalDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.remoteDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
+FAIL errorReason.name should be InvalidSessionDescriptionError. Was InvalidAccessError.
+FAIL pc.localDescription should throw an exception. Was null.
+FAIL pc.remoteDescription should throw an exception. Was null.
 PASS pc.signalingState is "stable"
 PASS pc.setRemoteDescription(sessionDescription, finishIfSucceeded, requestFailed3); did not throw exception.
 PASS setRemoteDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.remoteDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
+FAIL errorReason.name should be InvalidSessionDescriptionError. Was InvalidAccessError.
+FAIL pc.localDescription should throw an exception. Was null.
+FAIL pc.remoteDescription should throw an exception. Was null.
 PASS pc.signalingState is "stable"
 PASS pc.setRemoteDescription(sessionDescription, finishIfSucceeded, requestFailed4); did not throw exception.
 PASS setRemoteDescription failed.
-PASS errorReason.name is "InvalidSessionDescriptionError"
-PASS pc.localDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.remoteDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
+FAIL errorReason.name should be InvalidSessionDescriptionError. Was InvalidAccessError.
+FAIL pc.localDescription should throw an exception. Was null.
+FAIL pc.remoteDescription should throw an exception. Was null.
 PASS pc.signalingState is "stable"
 PASS pc.setLocalDescription(sessionDescription, requestSucceeded1, finishIfFailed); did not throw exception.
-PASS setLocalDescription succeeded.
-PASS pc.localDescription.type is "offer"
-PASS pc.localDescription.sdp is "local"
-PASS pc.remoteDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.signalingState is "have-local-offer"
-PASS pc.localDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.remoteDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.signalingState is "stable"
-PASS pc.setRemoteDescription(sessionDescription, requestSucceeded2, finishIfFailed); did not throw exception.
-PASS setRemoteDescription succeeded.
-PASS pc.localDescription threw exception InvalidStateError (DOM Exception 11): The object is in an invalid state..
-PASS pc.remoteDescription.type is "offer"
-PASS pc.remoteDescription.sdp is "remote"
-PASS pc.signalingState is "have-remote-offer"
+FAIL setRemoteDescription failed.
 PASS successfullyParsed is true
 
 TEST COMPLETE
index 3d3a24e..f4a2766 100644 (file)
@@ -161,49 +161,18 @@ fast/mediastream/MediaStreamTrack.html
 
 # WebRTC is not supported yet.
 fast/events/constructors/media-stream-event-constructor.html
-fast/mediastream/RTCIceCandidate.html
-fast/mediastream/RTCPeerConnection-AddRemoveStream.html
-fast/mediastream/RTCPeerConnection-createAnswer.html
-fast/mediastream/RTCPeerConnection-createOffer.html
-fast/mediastream/RTCPeerConnection-datachannel.html
-fast/mediastream/RTCPeerConnection-dtmf.html
-fast/mediastream/RTCPeerConnection-events.html
-fast/mediastream/RTCPeerConnection-getConfiguration.html
-fast/mediastream/RTCPeerConnection-have-local-offer.html
-fast/mediastream/RTCPeerConnection-have-local-pranswer.html
-fast/mediastream/RTCPeerConnection-have-remote-offer.html
-fast/mediastream/RTCPeerConnection-have-remote-pranswer.html
-fast/mediastream/RTCPeerConnection-ice.html
-fast/mediastream/RTCPeerConnection-addIceCandidate.html
-fast/mediastream/RTCPeerConnection-localDescription.html
-fast/mediastream/RTCPeerConnection-onnegotiationneeded.html
-fast/mediastream/RTCPeerConnection-remoteDescription.html
-fast/mediastream/RTCPeerConnection-stats.html
-fast/mediastream/RTCPeerConnection-statsSelector.html
-fast/mediastream/RTCPeerConnection-stable.html
-fast/mediastream/RTCPeerConnection.html
-fast/mediastream/RTCPeerConnection-js-built-ins-check-this.html
-fast/mediastream/RTCPeerConnection-inspect-offer.html
-fast/mediastream/RTCPeerConnection-add-removeTrack.html
-fast/mediastream/RTCPeerConnection-addTrack-reuse-sender.html
-fast/mediastream/RTCPeerConnection-more-media-to-negotiate.html
-fast/mediastream/RTCPeerConnection-closed-state.html
-fast/mediastream/RTCPeerConnection-overloaded-operations-params.html
-fast/mediastream/RTCPeerConnection-overloaded-operations.html
-fast/mediastream/RTCPeerConnection-addTransceiver.html
-fast/mediastream/RTCRtpSender-replaceTrack.html
-fast/mediastream/RTCSessionDescription.html
-fast/mediastream/RTCPeerConnection-setLocalDescription-offer.html
-fast/mediastream/RTCPeerConnection-setRemoteDescription-offer.html
-fast/mediastream/RTCTrackEvent-constructor.html
-fast/mediastream/RTCPeerConnection-inspect-answer.html
-fast/mediastream/RTCPeerConnection-media-setup-single-dialog.html
-fast/mediastream/RTCPeerConnection-media-setup-two-dialogs.html
-fast/mediastream/RTCPeerConnection-media-setup-callbacks-single-dialog.html
-fast/mediastream/RTCPeerConnection-legacy-stream-based-api.html
-fast/mediastream/RTCPeerConnection-icecandidate-event.html
-fast/mediastream/RTCPeerConnection-iceconnectionstatechange-event.html
-fast/mediastream/RTCPeerConnection-remotely-assigned-transceiver-mid.html
+fast/mediastream/RTCPeerConnection-datachannel.html [ Skip ]
+fast/mediastream/RTCPeerConnection-dtmf.html [ Skip ]
+fast/mediastream/RTCPeerConnection-events.html [ Skip ]
+fast/mediastream/RTCPeerConnection-ice.html [ Skip ]
+fast/mediastream/RTCPeerConnection-media-setup-callbacks-single-dialog.html [ Skip ]
+fast/mediastream/RTCPeerConnection-stats.html [ Skip ]
+fast/mediastream/RTCPeerConnection-statsSelector.html [ Skip ]
+fast/mediastream/RTCPeerConnection-setRemoteDescription-offer.html [ Skip ]
+fast/mediastream/RTCPeerConnection-remotely-assigned-transceiver-mid.html [ Skip ]
+fast/mediastream/RTCPeerConnection-media-setup-two-dialogs.html [ Skip ]
+fast/mediastream/RTCPeerConnection-media-setup-single-dialog.html [ Skip ]
+fast/mediastream/RTCPeerConnection-setLocalDescription-offer.html [ Skip ]
 
 # Asserts in debug.
 [ Debug ] fast/images/large-size-image-crash.html [ Skip ]
index ed797be..e83ab18 100644 (file)
@@ -3622,7 +3622,7 @@ if (WebCore_SDP_PROCESSOR_SCRIPTS)
 
     MAKE_JS_FILE_ARRAYS(
         ${DERIVED_SOURCES_WEBCORE_DIR}/SDPProcessorScriptsData.cpp
-        ${DERIVED_SOURCES_WEBCORE_DIR}/SDPProcessorScripts.h
+        ${DERIVED_SOURCES_WEBCORE_DIR}/SDPProcessorScriptsData.h
         WebCore_SDP_PROCESSOR_SCRIPTS
         WebCore_SDP_PROCESSOR_SCRIPTS_DEPENDENCIES
     )
index 78f7768..18683c8 100644 (file)
@@ -1,3 +1,23 @@
+2016-10-26  Youenn Fablet  <youenn@apple.com>
+
+        Enable SDPProcessor for Mac bots
+        https://bugs.webkit.org/show_bug.cgi?id=163940
+
+        Reviewed by Eric Carlson.
+
+        Covered by activated tests.
+
+        Activating processing of SDPProcessor scripts for Mac bots.
+        Moving platform/mediastream/openwebrtc/SDPProcessorScriptResource.cpp to platform/mediastream/SDPProcessorScriptResource.cpp.
+        This file is not tied to openwebrtc and allows retrieving the SDPProcessor script resource file content.
+
+        * DerivedSources.make:
+        * PlatformGTK.cmake:
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/mediastream/SDPProcessorScriptResource.cpp:
+        (WebCore::SDPProcessorScriptResource::scriptString):
+        * platform/mediastream/openwebrtc/SDPProcessorScriptResource.cpp: Removed.
+
 2016-10-26  Dave Hyatt  <hyatt@apple.com>
 
         [CSS Parser] Get functional pseudos parsing
index d509802..58f9321 100644 (file)
@@ -1002,6 +1002,23 @@ XPathGrammar.cpp : xml/XPathGrammar.y $(PROJECT_FILE)
 
 # --------
 
+# WebRTC scripts
+
+WEBCORE_SDP_PROCESSOR_SCRIPTS = 
+
+ifeq ($(OS),MACOS)
+    WEBCORE_SDP_PROCESSOR_SCRIPTS := $(WEBCORE_SDP_PROCESSOR_SCRIPTS) $(WebCore)/Modules/mediastream/sdp.js
+endif
+
+ifdef WEBCORE_SDP_PROCESSOR_SCRIPTS
+all : SDPProcessorScriptsData.h
+
+SDPProcessorScriptsData.h : Scripts/make-js-file-arrays.py $(WEBCORE_SDP_PROCESSOR_SCRIPTS)
+       PYTHONPATH=$(JavaScriptCore_SCRIPTS_DIR) $(PYTHON) $< $@ SDPProcessorScriptsData.cpp $(WEBCORE_SDP_PROCESSOR_SCRIPTS)
+endif
+
+# --------
+
 # user agent style sheets
 
 USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html.css $(WebCore)/css/quirks.css $(WebCore)/css/plugIns.css
index 67b5351..cd54af3 100644 (file)
@@ -166,7 +166,7 @@ list(APPEND WebCore_SOURCES
 
     platform/image-decoders/cairo/ImageBackingStoreCairo.cpp
 
-    platform/mediastream/openwebrtc/SDPProcessorScriptResource.cpp
+    platform/mediastream/SDPProcessorScriptResource.cpp
 
     platform/network/soup/AuthenticationChallengeSoup.cpp
     platform/network/soup/CertificateInfo.cpp
index dbdd047..2171ed4 100644 (file)
                CDAB6D2E17C814EE00C60B34 /* JSMediaControlsHost.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAB6D2C17C814EE00C60B34 /* JSMediaControlsHost.h */; };
                CDAB6D3117C9259500C60B34 /* UserAgentScripts.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAB6D2F17C9259500C60B34 /* UserAgentScripts.h */; };
                CDAB6D3217C9259500C60B34 /* UserAgentScriptsData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDAB6D3017C9259500C60B34 /* UserAgentScriptsData.cpp */; };
+               CDAB6D3217C9259500C60B35 /* SDPProcessorScriptsData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDAB6D3017C9259500C60B35 /* SDPProcessorScriptsData.cpp */; };
                CDAE8C091746B95700532D78 /* PlatformMediaSessionManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDAE8C071746B95700532D78 /* PlatformMediaSessionManager.cpp */; };
                CDBEAEAC19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDBEAEAA19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.mm */; };
                CDBEAEAD19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = CDBEAEAB19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.h */; };
                CDAB6D2C17C814EE00C60B34 /* JSMediaControlsHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaControlsHost.h; sourceTree = "<group>"; };
                CDAB6D2F17C9259500C60B34 /* UserAgentScripts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserAgentScripts.h; sourceTree = "<group>"; };
                CDAB6D3017C9259500C60B34 /* UserAgentScriptsData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserAgentScriptsData.cpp; sourceTree = "<group>"; };
+               CDAB6D3017C9259500C60B35 /* SDPProcessorScriptsData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SDPProcessorScriptsData.cpp; sourceTree = "<group>"; };
                CDAE8C071746B95700532D78 /* PlatformMediaSessionManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformMediaSessionManager.cpp; sourceTree = "<group>"; };
                CDAE8C081746B95700532D78 /* PlatformMediaSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformMediaSessionManager.h; sourceTree = "<group>"; };
                CDBEAEAA19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaSelectionGroupAVFObjC.mm; sourceTree = "<group>"; };
                                656581E909D1508D000E61D7 /* SVGNames.h */,
                                CDAB6D2F17C9259500C60B34 /* UserAgentScripts.h */,
                                CDAB6D3017C9259500C60B34 /* UserAgentScriptsData.cpp */,
+                               CDAB6D3017C9259500C60B35 /* SDPProcessorScriptsData.cpp */,
                                656581AE09D14EE6000E61D7 /* UserAgentStyleSheets.h */,
                                656581AF09D14EE6000E61D7 /* UserAgentStyleSheetsData.cpp */,
                                1A1414B313A0F0500019996C /* WebKitFontFamilyNames.cpp */,
                                26255F0018878DFF0006E1FD /* UserAgentIOS.mm in Sources */,
                                26255F0418878E110006E1FD /* UserAgentMac.mm in Sources */,
                                CDAB6D3217C9259500C60B34 /* UserAgentScriptsData.cpp in Sources */,
+                               CDAB6D3217C9259500C60B35 /* SDPProcessorScriptsData.cpp in Sources */,
                                65DF326109D1E199000BE325 /* UserAgentStyleSheetsData.cpp in Sources */,
                                1AE79D42188DB61F002239C2 /* UserContentController.cpp in Sources */,
                                7C3F01C21C8E5AC200ADD962 /* UserContentProvider.cpp in Sources */,
index f3fbd0e..36e6eff 100644 (file)
 #if ENABLE(WEB_RTC)
 #include "SDPProcessorScriptResource.h"
 
+#include "SDPProcessorScriptsData.h"
+#include <wtf/NeverDestroyed.h>
+
 namespace WebCore {
 
 namespace SDPProcessorScriptResource {
 
 const String& scriptString()
 {
-    return emptyString();
+    static NeverDestroyed<const String> script = String(sdpJavaScript);
+    return script;
 }
 
 } // namespace SDPProcessorScriptResource
diff --git a/Source/WebCore/platform/mediastream/openwebrtc/SDPProcessorScriptResource.cpp b/Source/WebCore/platform/mediastream/openwebrtc/SDPProcessorScriptResource.cpp
deleted file mode 100644 (file)
index 9bd2bb3..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2015 Ericsson AB. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Ericsson nor the names of its contributors
- *    may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(WEB_RTC)
-#include "SDPProcessorScriptResource.h"
-
-#include "SDPProcessorScripts.h"
-#include <wtf/NeverDestroyed.h>
-
-namespace WebCore {
-
-namespace SDPProcessorScriptResource {
-
-const String& scriptString()
-{
-    static NeverDestroyed<const String> script = String(sdpJavaScript);
-    return script;
-}
-
-} // namespace SDPProcessorScriptResource
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)