<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[207901] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/207901">207901</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-26 09:46:23 -0700 (Wed, 26 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enable SDPProcessor for Mac bots
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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectioncreateAnswerexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectioncreateOfferexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionhavelocalofferexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-local-offer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionhavelocalpranswerexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-local-pranswer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionhaveremoteofferexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-remote-offer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionhaveremotepranswerexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-remote-pranswer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionlocalDescriptionexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-localDescription-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionremoteDescriptionexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-remoteDescription-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionstableexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-stable-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamSDPProcessorScriptResourcecpp">trunk/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformmediastreamopenwebrtcSDPProcessorScriptResourcecpp">trunk/Source/WebCore/platform/mediastream/openwebrtc/SDPProcessorScriptResource.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/LayoutTests/ChangeLog 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+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:
+
</ins><span class="cx"> 2016-10-26 Nael Ouedraogo <nael.ouedraogo@crf.canon.fr>
</span><span class="cx"> WebRTC: The RTCTrackEventInit dictionary needs required members
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=158536
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectioncreateAnswerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer-expected.txt (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer-expected.txt 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer-expected.txt 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -4,13 +4,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS pc.createAnswer(requestSucceeded1, requestFailed1); did not throw exception.
</span><del>-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.
</del><ins>+FAIL createAnswer request failed.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectioncreateOfferexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer-expected.txt (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer-expected.txt 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer-expected.txt 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -6,27 +6,8 @@
</span><span class="cx"> PASS pc.createOffer(requestSucceeded1, requestFailed1); did not throw exception.
</span><span class="cx"> PASS createOffer request succeeded.
</span><span class="cx"> PASS sessionDescription.type is "offer"
</span><del>-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"
</del><ins>+FAIL pc.createOffer(requestSucceeded2, requestFailed2, {}); should throw an exception. Was [object Promise].
+FAIL createOffer request succeeded.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionhavelocalofferexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-local-offer-expected.txt (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-local-offer-expected.txt 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-local-offer-expected.txt 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -5,61 +5,7 @@
</span><span class="cx">
</span><span class="cx"> PASS pc.signalingState is "stable"
</span><span class="cx"> PASS pc.setLocalDescription(sessionDescription, requestSucceeded1, finishIfFailed); did not throw exception.
</span><del>-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"
</del><ins>+FAIL setRemoteDescription failed.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionhavelocalpranswerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-local-pranswer-expected.txt (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-local-pranswer-expected.txt 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-local-pranswer-expected.txt 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -5,63 +5,7 @@
</span><span class="cx">
</span><span class="cx"> PASS pc.signalingState is "stable"
</span><span class="cx"> PASS pc.setRemoteDescription(sessionDescription, requestSucceeded1, finishIfFailed); did not throw exception.
</span><del>-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"
</del><ins>+FAIL setRemoteDescription failed.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionhaveremoteofferexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-remote-offer-expected.txt (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-remote-offer-expected.txt 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-remote-offer-expected.txt 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -5,61 +5,7 @@
</span><span class="cx">
</span><span class="cx"> PASS pc.signalingState is "stable"
</span><span class="cx"> PASS pc.setRemoteDescription(sessionDescription, requestSucceeded1, finishIfFailed); did not throw exception.
</span><del>-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"
</del><ins>+FAIL setRemoteDescription failed.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionhaveremotepranswerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-remote-pranswer-expected.txt (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-remote-pranswer-expected.txt 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-remote-pranswer-expected.txt 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -5,63 +5,7 @@
</span><span class="cx">
</span><span class="cx"> PASS pc.signalingState is "stable"
</span><span class="cx"> PASS pc.setLocalDescription(sessionDescription, requestSucceeded1, finishIfFailed); did not throw exception.
</span><del>-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"
</del><ins>+FAIL setRemoteDescription failed.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionlocalDescriptionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-localDescription-expected.txt (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-localDescription-expected.txt 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-localDescription-expected.txt 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -4,13 +4,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS pc.setLocalDescription(sessionDescription, requestSucceeded1, requestFailed1); did not throw exception.
</span><del>-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"
</del><ins>+FAIL requestFailed was called.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionremoteDescriptionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-remoteDescription-expected.txt (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-remoteDescription-expected.txt 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-remoteDescription-expected.txt 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -4,13 +4,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS pc.setRemoteDescription(sessionDescription, requestSucceeded1, requestFailed1); did not throw exception.
</span><del>-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"
</del><ins>+FAIL requestFailed was called.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionstableexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-stable-expected.txt (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-stable-expected.txt 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-stable-expected.txt 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -6,43 +6,30 @@
</span><span class="cx"> PASS pc.signalingState is "stable"
</span><span class="cx"> PASS pc.setLocalDescription(sessionDescription, finishIfSucceeded, requestFailed1); did not throw exception.
</span><span class="cx"> PASS setLocalDescription failed.
</span><del>-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..
</del><ins>+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.
</ins><span class="cx"> PASS pc.signalingState is "stable"
</span><span class="cx"> PASS pc.setLocalDescription(sessionDescription, finishIfSucceeded, requestFailed2); did not throw exception.
</span><span class="cx"> PASS setLocalDescription failed.
</span><del>-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..
</del><ins>+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.
</ins><span class="cx"> PASS pc.signalingState is "stable"
</span><span class="cx"> PASS pc.setRemoteDescription(sessionDescription, finishIfSucceeded, requestFailed3); did not throw exception.
</span><span class="cx"> PASS setRemoteDescription failed.
</span><del>-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..
</del><ins>+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.
</ins><span class="cx"> PASS pc.signalingState is "stable"
</span><span class="cx"> PASS pc.setRemoteDescription(sessionDescription, finishIfSucceeded, requestFailed4); did not throw exception.
</span><span class="cx"> PASS setRemoteDescription failed.
</span><del>-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..
</del><ins>+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.
</ins><span class="cx"> PASS pc.signalingState is "stable"
</span><span class="cx"> PASS pc.setLocalDescription(sessionDescription, requestSucceeded1, finishIfFailed); did not throw exception.
</span><del>-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"
</del><ins>+FAIL setRemoteDescription failed.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -161,49 +161,18 @@
</span><span class="cx">
</span><span class="cx"> # WebRTC is not supported yet.
</span><span class="cx"> fast/events/constructors/media-stream-event-constructor.html
</span><del>-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
</del><ins>+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 ]
</ins><span class="cx">
</span><span class="cx"> # Asserts in debug.
</span><span class="cx"> [ Debug ] fast/images/large-size-image-crash.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -3622,7 +3622,7 @@
</span><span class="cx">
</span><span class="cx"> MAKE_JS_FILE_ARRAYS(
</span><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/SDPProcessorScriptsData.cpp
</span><del>- ${DERIVED_SOURCES_WEBCORE_DIR}/SDPProcessorScripts.h
</del><ins>+ ${DERIVED_SOURCES_WEBCORE_DIR}/SDPProcessorScriptsData.h
</ins><span class="cx"> WebCore_SDP_PROCESSOR_SCRIPTS
</span><span class="cx"> WebCore_SDP_PROCESSOR_SCRIPTS_DEPENDENCIES
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/Source/WebCore/ChangeLog 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-10-26 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Get functional pseudos parsing
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/Source/WebCore/DerivedSources.make 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -1002,6 +1002,23 @@
</span><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><ins>+# 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
+
+# --------
+
</ins><span class="cx"> # user agent style sheets
</span><span class="cx">
</span><span class="cx"> USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html.css $(WebCore)/css/quirks.css $(WebCore)/css/plugIns.css
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx">
</span><span class="cx"> platform/image-decoders/cairo/ImageBackingStoreCairo.cpp
</span><span class="cx">
</span><del>- platform/mediastream/openwebrtc/SDPProcessorScriptResource.cpp
</del><ins>+ platform/mediastream/SDPProcessorScriptResource.cpp
</ins><span class="cx">
</span><span class="cx"> platform/network/soup/AuthenticationChallengeSoup.cpp
</span><span class="cx"> platform/network/soup/CertificateInfo.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -5759,6 +5759,7 @@
</span><span class="cx"> CDAB6D2E17C814EE00C60B34 /* JSMediaControlsHost.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAB6D2C17C814EE00C60B34 /* JSMediaControlsHost.h */; };
</span><span class="cx"> CDAB6D3117C9259500C60B34 /* UserAgentScripts.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAB6D2F17C9259500C60B34 /* UserAgentScripts.h */; };
</span><span class="cx"> CDAB6D3217C9259500C60B34 /* UserAgentScriptsData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDAB6D3017C9259500C60B34 /* UserAgentScriptsData.cpp */; };
</span><ins>+ CDAB6D3217C9259500C60B35 /* SDPProcessorScriptsData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDAB6D3017C9259500C60B35 /* SDPProcessorScriptsData.cpp */; };
</ins><span class="cx"> CDAE8C091746B95700532D78 /* PlatformMediaSessionManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDAE8C071746B95700532D78 /* PlatformMediaSessionManager.cpp */; };
</span><span class="cx"> CDBEAEAC19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDBEAEAA19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.mm */; };
</span><span class="cx"> CDBEAEAD19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = CDBEAEAB19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.h */; };
</span><span class="lines">@@ -13518,6 +13519,7 @@
</span><span class="cx"> CDAB6D2C17C814EE00C60B34 /* JSMediaControlsHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaControlsHost.h; sourceTree = "<group>"; };
</span><span class="cx"> CDAB6D2F17C9259500C60B34 /* UserAgentScripts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserAgentScripts.h; sourceTree = "<group>"; };
</span><span class="cx"> CDAB6D3017C9259500C60B34 /* UserAgentScriptsData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserAgentScriptsData.cpp; sourceTree = "<group>"; };
</span><ins>+ CDAB6D3017C9259500C60B35 /* SDPProcessorScriptsData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SDPProcessorScriptsData.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> CDAE8C071746B95700532D78 /* PlatformMediaSessionManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformMediaSessionManager.cpp; sourceTree = "<group>"; };
</span><span class="cx"> CDAE8C081746B95700532D78 /* PlatformMediaSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformMediaSessionManager.h; sourceTree = "<group>"; };
</span><span class="cx"> CDBEAEAA19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaSelectionGroupAVFObjC.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -17242,6 +17244,7 @@
</span><span class="cx"> 656581E909D1508D000E61D7 /* SVGNames.h */,
</span><span class="cx"> CDAB6D2F17C9259500C60B34 /* UserAgentScripts.h */,
</span><span class="cx"> CDAB6D3017C9259500C60B34 /* UserAgentScriptsData.cpp */,
</span><ins>+ CDAB6D3017C9259500C60B35 /* SDPProcessorScriptsData.cpp */,
</ins><span class="cx"> 656581AE09D14EE6000E61D7 /* UserAgentStyleSheets.h */,
</span><span class="cx"> 656581AF09D14EE6000E61D7 /* UserAgentStyleSheetsData.cpp */,
</span><span class="cx"> 1A1414B313A0F0500019996C /* WebKitFontFamilyNames.cpp */,
</span><span class="lines">@@ -31008,6 +31011,7 @@
</span><span class="cx"> 26255F0018878DFF0006E1FD /* UserAgentIOS.mm in Sources */,
</span><span class="cx"> 26255F0418878E110006E1FD /* UserAgentMac.mm in Sources */,
</span><span class="cx"> CDAB6D3217C9259500C60B34 /* UserAgentScriptsData.cpp in Sources */,
</span><ins>+ CDAB6D3217C9259500C60B35 /* SDPProcessorScriptsData.cpp in Sources */,
</ins><span class="cx"> 65DF326109D1E199000BE325 /* UserAgentStyleSheetsData.cpp in Sources */,
</span><span class="cx"> 1AE79D42188DB61F002239C2 /* UserContentController.cpp in Sources */,
</span><span class="cx"> 7C3F01C21C8E5AC200ADD962 /* UserContentProvider.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamSDPProcessorScriptResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.cpp (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.cpp 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.cpp 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -33,6 +33,9 @@
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx"> #include "SDPProcessorScriptResource.h"
</span><span class="cx">
</span><ins>+#include "SDPProcessorScriptsData.h"
+#include <wtf/NeverDestroyed.h>
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> namespace SDPProcessorScriptResource {
</span><span class="lines">@@ -39,7 +42,8 @@
</span><span class="cx">
</span><span class="cx"> const String& scriptString()
</span><span class="cx"> {
</span><del>- return emptyString();
</del><ins>+ static NeverDestroyed<const String> script = String(sdpJavaScript);
+ return script;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace SDPProcessorScriptResource
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamopenwebrtcSDPProcessorScriptResourcecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mediastream/openwebrtc/SDPProcessorScriptResource.cpp (207900 => 207901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/openwebrtc/SDPProcessorScriptResource.cpp 2016-10-26 16:14:17 UTC (rev 207900)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/SDPProcessorScriptResource.cpp 2016-10-26 16:46:23 UTC (rev 207901)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre>
</div>
</div>
</body>
</html>