<!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>[214212] trunk/Source/WebCore</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/214212">214212</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2017-03-21 00:50:04 -0700 (Tue, 21 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up RTCSdpType, RTC enums and headers
https://bugs.webkit.org/show_bug.cgi?id=169741
Reviewed by Youenn Fablet.
Convert to RTCSdpType.
* Modules/mediastream/MediaEndpointPeerConnection.cpp:
* Modules/mediastream/MediaEndpointPeerConnection.h:
* Modules/mediastream/MediaEndpointSessionDescription.cpp:
* Modules/mediastream/MediaEndpointSessionDescription.h:
* Modules/mediastream/PeerConnectionBackend.cpp:
* Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
Convert SDP argument to lvalue.
* Modules/mediastream/RTCSessionDescription.cpp:
* Modules/mediastream/RTCSessionDescription.h:
* Modules/mediastream/RTCSessionDescription.idl:
Keep RTC enum IDLs above platform. Move the C++ enum headers into platform.
* Modules/mediastream/RTCEnums.h: Removed.
* Modules/mediastream/RTCIceConnectionState.h: Removed.
* Modules/mediastream/RTCIceGatheringState.h: Removed.
* Modules/mediastream/RTCIceTransportState.h: Removed.
* Modules/mediastream/RTCSignalingState.h: Removed.
* platform/mediastream/PeerConnectionStates.h: Remove from .xcodeproj. Move enums to separate headers.
* platform/mediastream/RTCBundlePolicy.h:
* platform/mediastream/RTCIceConnectionState.h:
* platform/mediastream/RTCIceGatheringState.h:
* platform/mediastream/RTCIceTransportPolicy.h:
* platform/mediastream/RTCIceTransportState.h:
* platform/mediastream/RTCRtpTransceiverDirection.h: Renamed from Source/WebCore/Modules/mediastream/RTCRtpTransceiverDirection.h.
* platform/mediastream/RTCSdpType.h:
* platform/mediastream/RTCSignalingState.h:
Move RtpTransceiverDirection out to a separate IDL.
* Modules/mediastream/RTCPeerConnection.idl:
* Modules/mediastream/RTCRtpTransceiver.cpp:
* Modules/mediastream/RTCRtpTransceiver.h:
* WebCore.xcodeproj/project.pbxproj:
Replace RTCEnums include with specific headers per enum.
* Modules/mediastream/PeerConnectionBackend.h:
* Modules/mediastream/RTCConfiguration.h:
* Modules/mediastream/RTCIceTransport.h:
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::completeAddTransceiver): Remove unneeded static_cast.
* Modules/mediastream/RTCPeerConnection.h:
* Modules/mediastream/RTCRtpTransceiver.h:
* platform/mediastream/MediaEndpoint.h:
* platform/mediastream/MediaEndpointConfiguration.h:
* platform/mock/MockMediaEndpoint.h:
Clean up license.
* Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h:
* Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h:
* Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.h:
Modernize header to use #pragma once.
* platform/mediastream/RTCDTMFSenderHandler.h:
* platform/mediastream/RTCDTMFSenderHandlerClient.h:
* platform/mediastream/RTCIceCandidateDescriptor.h:
* platform/mediastream/RTCPeerConnectionHandlerClient.h:
* platform/mediastream/RTCSessionDescriptionDescriptor.h:
* platform/mediastream/RTCSessionDescriptionRequest.h:
* platform/mediastream/RTCVoidRequest.h:
* platform/mock/RTCNotifiersMock.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaEndpointSessionDescriptioncpp">trunk/Source/WebCore/Modules/mediastream/MediaEndpointSessionDescription.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaEndpointSessionDescriptionh">trunk/Source/WebCore/Modules/mediastream/MediaEndpointSessionDescription.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamPeerConnectionBackendcpp">trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamPeerConnectionBackendh">trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCConfigurationh">trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceTransporth">trunk/Source/WebCore/Modules/mediastream/RTCIceTransport.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpTransceivercpp">trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpTransceiverh">trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCSessionDescriptioncpp">trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionh">trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionidl">trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCDataChannelHandlerh">trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointcpp">trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointh">trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCPeerConnectionBackendh">trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.h</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaEndpointh">trunk/Source/WebCore/platform/mediastream/MediaEndpoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaEndpointConfigurationh">trunk/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamPeerConnectionStatesh">trunk/Source/WebCore/platform/mediastream/PeerConnectionStates.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCDTMFSenderHandlerh">trunk/Source/WebCore/platform/mediastream/RTCDTMFSenderHandler.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCDTMFSenderHandlerClienth">trunk/Source/WebCore/platform/mediastream/RTCDTMFSenderHandlerClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCIceCandidateDescriptorh">trunk/Source/WebCore/platform/mediastream/RTCIceCandidateDescriptor.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlerClienth">trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCSessionDescriptionDescriptorh">trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCSessionDescriptionRequesth">trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionRequest.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCVoidRequesth">trunk/Source/WebCore/platform/mediastream/RTCVoidRequest.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockMediaEndpointh">trunk/Source/WebCore/platform/mock/MockMediaEndpoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockRTCNotifiersMockh">trunk/Source/WebCore/platform/mock/RTCNotifiersMock.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCBundlePolicyh">trunk/Source/WebCore/platform/mediastream/RTCBundlePolicy.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCIceConnectionStateh">trunk/Source/WebCore/platform/mediastream/RTCIceConnectionState.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCIceGatheringStateh">trunk/Source/WebCore/platform/mediastream/RTCIceGatheringState.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCIceTransportPolicyh">trunk/Source/WebCore/platform/mediastream/RTCIceTransportPolicy.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCIceTransportStateh">trunk/Source/WebCore/platform/mediastream/RTCIceTransportState.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCRtpTransceiverDirectionh">trunk/Source/WebCore/platform/mediastream/RTCRtpTransceiverDirection.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCSdpTypeh">trunk/Source/WebCore/platform/mediastream/RTCSdpType.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCSignalingStateh">trunk/Source/WebCore/platform/mediastream/RTCSignalingState.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCEnumsh">trunk/Source/WebCore/Modules/mediastream/RTCEnums.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceConnectionStateh">trunk/Source/WebCore/Modules/mediastream/RTCIceConnectionState.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceGatheringStateh">trunk/Source/WebCore/Modules/mediastream/RTCIceGatheringState.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCIceTransportStateh">trunk/Source/WebCore/Modules/mediastream/RTCIceTransportState.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCRtpTransceiverDirectionh">trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiverDirection.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCSignalingStateh">trunk/Source/WebCore/Modules/mediastream/RTCSignalingState.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/ChangeLog 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,3 +1,72 @@
</span><ins>+2017-03-21 Jon Lee <jonlee@apple.com>
+
+ Clean up RTCSdpType, RTC enums and headers
+ https://bugs.webkit.org/show_bug.cgi?id=169741
+
+ Reviewed by Youenn Fablet.
+
+ Convert to RTCSdpType.
+ * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+ * Modules/mediastream/MediaEndpointPeerConnection.h:
+ * Modules/mediastream/MediaEndpointSessionDescription.cpp:
+ * Modules/mediastream/MediaEndpointSessionDescription.h:
+ * Modules/mediastream/PeerConnectionBackend.cpp:
+ * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
+
+ Convert SDP argument to lvalue.
+ * Modules/mediastream/RTCSessionDescription.cpp:
+ * Modules/mediastream/RTCSessionDescription.h:
+ * Modules/mediastream/RTCSessionDescription.idl:
+
+ Keep RTC enum IDLs above platform. Move the C++ enum headers into platform.
+ * Modules/mediastream/RTCEnums.h: Removed.
+ * Modules/mediastream/RTCIceConnectionState.h: Removed.
+ * Modules/mediastream/RTCIceGatheringState.h: Removed.
+ * Modules/mediastream/RTCIceTransportState.h: Removed.
+ * Modules/mediastream/RTCSignalingState.h: Removed.
+ * platform/mediastream/PeerConnectionStates.h: Remove from .xcodeproj. Move enums to separate headers.
+ * platform/mediastream/RTCBundlePolicy.h:
+ * platform/mediastream/RTCIceConnectionState.h:
+ * platform/mediastream/RTCIceGatheringState.h:
+ * platform/mediastream/RTCIceTransportPolicy.h:
+ * platform/mediastream/RTCIceTransportState.h:
+ * platform/mediastream/RTCRtpTransceiverDirection.h: Renamed from Source/WebCore/Modules/mediastream/RTCRtpTransceiverDirection.h.
+ * platform/mediastream/RTCSdpType.h:
+ * platform/mediastream/RTCSignalingState.h:
+
+ Move RtpTransceiverDirection out to a separate IDL.
+ * Modules/mediastream/RTCPeerConnection.idl:
+ * Modules/mediastream/RTCRtpTransceiver.cpp:
+ * Modules/mediastream/RTCRtpTransceiver.h:
+ * WebCore.xcodeproj/project.pbxproj:
+
+ Replace RTCEnums include with specific headers per enum.
+ * Modules/mediastream/PeerConnectionBackend.h:
+ * Modules/mediastream/RTCConfiguration.h:
+ * Modules/mediastream/RTCIceTransport.h:
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::completeAddTransceiver): Remove unneeded static_cast.
+ * Modules/mediastream/RTCPeerConnection.h:
+ * Modules/mediastream/RTCRtpTransceiver.h:
+ * platform/mediastream/MediaEndpoint.h:
+ * platform/mediastream/MediaEndpointConfiguration.h:
+ * platform/mock/MockMediaEndpoint.h:
+
+ Clean up license.
+ * Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h:
+ * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h:
+ * Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.h:
+
+ Modernize header to use #pragma once.
+ * platform/mediastream/RTCDTMFSenderHandler.h:
+ * platform/mediastream/RTCDTMFSenderHandlerClient.h:
+ * platform/mediastream/RTCIceCandidateDescriptor.h:
+ * platform/mediastream/RTCPeerConnectionHandlerClient.h:
+ * platform/mediastream/RTCSessionDescriptionDescriptor.h:
+ * platform/mediastream/RTCSessionDescriptionRequest.h:
+ * platform/mediastream/RTCVoidRequest.h:
+ * platform/mock/RTCNotifiersMock.h:
+
</ins><span class="cx"> 2017-03-20 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Add iceCandidatePoolSize to RTCConfiguration
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx"> MediaEndpointSessionDescription* localDescription = internalLocalDescription();
</span><span class="cx"> unsigned previousNumberOfMediaDescriptions = localDescription ? localDescription->configuration()->mediaDescriptions().size() : 0;
</span><span class="cx"> bool hasNewMediaDescriptions = mediaDescriptions.size() > previousNumberOfMediaDescriptions;
</span><del>- bool isInitiator = newDescription->type() == RTCSessionDescription::SdpType::Offer;
</del><ins>+ bool isInitiator = newDescription->type() == RTCSdpType::Offer;
</ins><span class="cx">
</span><span class="cx"> if (hasNewMediaDescriptions) {
</span><span class="cx"> MediaEndpoint::UpdateResult result = m_mediaEndpoint->updateReceiveConfiguration(newDescription->configuration(), isInitiator);
</span><span class="lines">@@ -392,12 +392,12 @@
</span><span class="cx">
</span><span class="cx"> // Update state and local descriptions according to setLocal/RemoteDescription processing model
</span><span class="cx"> switch (newDescription->type()) {
</span><del>- case RTCSessionDescription::SdpType::Offer:
</del><ins>+ case RTCSdpType::Offer:
</ins><span class="cx"> m_pendingLocalDescription = WTFMove(newDescription);
</span><span class="cx"> newSignalingState = RTCSignalingState::HaveLocalOffer;
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case RTCSessionDescription::SdpType::Answer:
</del><ins>+ case RTCSdpType::Answer:
</ins><span class="cx"> m_currentLocalDescription = WTFMove(newDescription);
</span><span class="cx"> m_currentRemoteDescription = m_pendingRemoteDescription;
</span><span class="cx"> m_pendingLocalDescription = nullptr;
</span><span class="lines">@@ -405,12 +405,12 @@
</span><span class="cx"> newSignalingState = RTCSignalingState::Stable;
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case RTCSessionDescription::SdpType::Rollback:
</del><ins>+ case RTCSdpType::Rollback:
</ins><span class="cx"> m_pendingLocalDescription = nullptr;
</span><span class="cx"> newSignalingState = RTCSignalingState::Stable;
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case RTCSessionDescription::SdpType::Pranswer:
</del><ins>+ case RTCSdpType::Pranswer:
</ins><span class="cx"> m_pendingLocalDescription = WTFMove(newDescription);
</span><span class="cx"> newSignalingState = RTCSignalingState::HaveLocalPranswer;
</span><span class="cx"> break;
</span><span class="lines">@@ -464,7 +464,7 @@
</span><span class="cx"> mediaDescription.payloads = m_mediaEndpoint->filterPayloads(mediaDescription.payloads, mediaDescription.type == "audio" ? m_defaultAudioPayloads : m_defaultVideoPayloads);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool isInitiator = newDescription->type() == RTCSessionDescription::SdpType::Answer;
</del><ins>+ bool isInitiator = newDescription->type() == RTCSdpType::Answer;
</ins><span class="cx"> const RtpTransceiverVector& transceivers = m_peerConnection.getTransceivers();
</span><span class="cx">
</span><span class="cx"> RealtimeMediaSourceMap sendSourceMap;
</span><span class="lines">@@ -556,12 +556,12 @@
</span><span class="cx">
</span><span class="cx"> // Update state and local descriptions according to setLocal/RemoteDescription processing model
</span><span class="cx"> switch (newDescription->type()) {
</span><del>- case RTCSessionDescription::SdpType::Offer:
</del><ins>+ case RTCSdpType::Offer:
</ins><span class="cx"> m_pendingRemoteDescription = WTFMove(newDescription);
</span><span class="cx"> newSignalingState = RTCSignalingState::HaveRemoteOffer;
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case RTCSessionDescription::SdpType::Answer:
</del><ins>+ case RTCSdpType::Answer:
</ins><span class="cx"> m_currentRemoteDescription = WTFMove(newDescription);
</span><span class="cx"> m_currentLocalDescription = m_pendingLocalDescription;
</span><span class="cx"> m_pendingRemoteDescription = nullptr;
</span><span class="lines">@@ -569,12 +569,12 @@
</span><span class="cx"> newSignalingState = RTCSignalingState::Stable;
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case RTCSessionDescription::SdpType::Rollback:
</del><ins>+ case RTCSdpType::Rollback:
</ins><span class="cx"> m_pendingRemoteDescription = nullptr;
</span><span class="cx"> newSignalingState = RTCSignalingState::Stable;
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case RTCSessionDescription::SdpType::Pranswer:
</del><ins>+ case RTCSdpType::Pranswer:
</ins><span class="cx"> m_pendingRemoteDescription = WTFMove(newDescription);
</span><span class="cx"> newSignalingState = RTCSignalingState::HaveRemotePranswer;
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx">
</span><span class="cx"> #include "MediaEndpoint.h"
</span><span class="cx"> #include "PeerConnectionBackend.h"
</span><del>-#include "RTCEnums.h"
</del><span class="cx"> #include "RTCSessionDescription.h"
</span><span class="cx"> #include <wtf/Function.h>
</span><span class="cx">
</span><span class="lines">@@ -88,8 +87,8 @@
</span><span class="cx">
</span><span class="cx"> void replaceTrackTask(RTCRtpSender&, const String& mid, Ref<MediaStreamTrack>&&, DOMPromise<void>&);
</span><span class="cx">
</span><del>- bool localDescriptionTypeValidForState(RTCSessionDescription::SdpType) const;
- bool remoteDescriptionTypeValidForState(RTCSessionDescription::SdpType) const;
</del><ins>+ bool localDescriptionTypeValidForState(RTCSdpType) const;
+ bool remoteDescriptionTypeValidForState(RTCSdpType) const;
</ins><span class="cx">
</span><span class="cx"> MediaEndpointSessionDescription* internalLocalDescription() const;
</span><span class="cx"> MediaEndpointSessionDescription* internalRemoteDescription() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointSessionDescriptioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointSessionDescription.cpp (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointSessionDescription.cpp 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointSessionDescription.cpp 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2015, 2016 Ericsson AB. All rights reserved.
</span><ins>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -51,7 +52,7 @@
</span><span class="cx"> STRING_FUNCTION(answer)
</span><span class="cx"> STRING_FUNCTION(rollback)
</span><span class="cx">
</span><del>-Ref<MediaEndpointSessionDescription> MediaEndpointSessionDescription::create(RTCSessionDescription::SdpType type, RefPtr<MediaEndpointSessionConfiguration>&& configuration)
</del><ins>+Ref<MediaEndpointSessionDescription> MediaEndpointSessionDescription::create(RTCSdpType type, RefPtr<MediaEndpointSessionConfiguration>&& configuration)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new MediaEndpointSessionDescription(type, WTFMove(configuration), nullptr));
</span><span class="cx"> }
</span><span class="lines">@@ -86,19 +87,20 @@
</span><span class="cx"> return m_rtcDescription;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return RTCSessionDescription::create(m_type, sdpString);
</del><ins>+ return RTCSessionDescription::create(m_type, WTFMove(sdpString));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: unify with LibWebRTCMediaEndpoint sessionDescriptionType().
</ins><span class="cx"> const String& MediaEndpointSessionDescription::typeString() const
</span><span class="cx"> {
</span><span class="cx"> switch (m_type) {
</span><del>- case RTCSessionDescription::SdpType::Offer:
</del><ins>+ case RTCSdpType::Offer:
</ins><span class="cx"> return offerString();
</span><del>- case RTCSessionDescription::SdpType::Pranswer:
</del><ins>+ case RTCSdpType::Pranswer:
</ins><span class="cx"> return pranswerString();
</span><del>- case RTCSessionDescription::SdpType::Answer:
</del><ins>+ case RTCSdpType::Answer:
</ins><span class="cx"> return answerString();
</span><del>- case RTCSessionDescription::SdpType::Rollback:
</del><ins>+ case RTCSdpType::Rollback:
</ins><span class="cx"> return rollbackString();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointSessionDescriptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointSessionDescription.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointSessionDescription.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointSessionDescription.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -45,13 +45,13 @@
</span><span class="cx">
</span><span class="cx"> class MediaEndpointSessionDescription : public RefCounted<MediaEndpointSessionDescription> {
</span><span class="cx"> public:
</span><del>- static Ref<MediaEndpointSessionDescription> create(RTCSessionDescription::SdpType, RefPtr<MediaEndpointSessionConfiguration>&&);
</del><ins>+ static Ref<MediaEndpointSessionDescription> create(RTCSdpType, RefPtr<MediaEndpointSessionConfiguration>&&);
</ins><span class="cx"> static ExceptionOr<Ref<MediaEndpointSessionDescription>> create(RefPtr<RTCSessionDescription>&&, const SDPProcessor&);
</span><span class="cx"> virtual ~MediaEndpointSessionDescription() { } // FIXME: Why is this virtual? There are no other virtual functions in this class.
</span><span class="cx">
</span><span class="cx"> RefPtr<RTCSessionDescription> toRTCSessionDescription(const SDPProcessor&) const;
</span><span class="cx">
</span><del>- RTCSessionDescription::SdpType type() const { return m_type; }
</del><ins>+ RTCSdpType type() const { return m_type; }
</ins><span class="cx"> const String& typeString() const;
</span><span class="cx"> MediaEndpointSessionConfiguration* configuration() const { return m_configuration.get(); }
</span><span class="cx">
</span><span class="lines">@@ -58,13 +58,13 @@
</span><span class="cx"> bool isLaterThan(MediaEndpointSessionDescription* other) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- MediaEndpointSessionDescription(RTCSessionDescription::SdpType type, RefPtr<MediaEndpointSessionConfiguration>&& configuration, RefPtr<RTCSessionDescription>&& rtcDescription)
</del><ins>+ MediaEndpointSessionDescription(RTCSdpType type, RefPtr<MediaEndpointSessionConfiguration>&& configuration, RefPtr<RTCSessionDescription>&& rtcDescription)
</ins><span class="cx"> : m_type(type)
</span><span class="cx"> , m_configuration(configuration)
</span><span class="cx"> , m_rtcDescription(WTFMove(rtcDescription))
</span><span class="cx"> { }
</span><span class="cx">
</span><del>- RTCSessionDescription::SdpType m_type;
</del><ins>+ RTCSdpType m_type;
</ins><span class="cx"> RefPtr<MediaEndpointSessionConfiguration> m_configuration;
</span><span class="cx">
</span><span class="cx"> RefPtr<RTCSessionDescription> m_rtcDescription;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamPeerConnectionBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ASSERT(m_offerAnswerPromise);
</span><del>- m_offerAnswerPromise->resolve(RTCSessionDescription::create(RTCSessionDescription::SdpType::Offer, WTFMove(sdp)));
</del><ins>+ m_offerAnswerPromise->resolve(RTCSessionDescription::create(RTCSdpType::Offer, WTFMove(sdp)));
</ins><span class="cx"> m_offerAnswerPromise = std::nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ASSERT(m_offerAnswerPromise);
</span><del>- m_offerAnswerPromise->resolve(RTCSessionDescription::create(RTCSessionDescription::SdpType::Answer, WTFMove(sdp)));
</del><ins>+ m_offerAnswerPromise->resolve(RTCSessionDescription::create(RTCSdpType::Answer, WTFMove(sdp)));
</ins><span class="cx"> m_offerAnswerPromise = std::nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -109,17 +109,17 @@
</span><span class="cx"> m_offerAnswerPromise = std::nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool isLocalDescriptionTypeValidForState(RTCSessionDescription::SdpType type, RTCSignalingState state)
</del><ins>+static inline bool isLocalDescriptionTypeValidForState(RTCSdpType type, RTCSignalingState state)
</ins><span class="cx"> {
</span><span class="cx"> switch (state) {
</span><span class="cx"> case RTCSignalingState::Stable:
</span><del>- return type == RTCSessionDescription::SdpType::Offer;
</del><ins>+ return type == RTCSdpType::Offer;
</ins><span class="cx"> case RTCSignalingState::HaveLocalOffer:
</span><del>- return type == RTCSessionDescription::SdpType::Offer;
</del><ins>+ return type == RTCSdpType::Offer;
</ins><span class="cx"> case RTCSignalingState::HaveRemoteOffer:
</span><del>- return type == RTCSessionDescription::SdpType::Answer || type == RTCSessionDescription::SdpType::Pranswer;
</del><ins>+ return type == RTCSdpType::Answer || type == RTCSdpType::Pranswer;
</ins><span class="cx"> case RTCSignalingState::HaveLocalPranswer:
</span><del>- return type == RTCSessionDescription::SdpType::Answer || type == RTCSessionDescription::SdpType::Pranswer;
</del><ins>+ return type == RTCSdpType::Answer || type == RTCSdpType::Pranswer;
</ins><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="cx"> };
</span><span class="lines">@@ -167,17 +167,17 @@
</span><span class="cx"> m_setDescriptionPromise = std::nullopt;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool isRemoteDescriptionTypeValidForState(RTCSessionDescription::SdpType type, RTCSignalingState state)
</del><ins>+static inline bool isRemoteDescriptionTypeValidForState(RTCSdpType type, RTCSignalingState state)
</ins><span class="cx"> {
</span><span class="cx"> switch (state) {
</span><span class="cx"> case RTCSignalingState::Stable:
</span><del>- return type == RTCSessionDescription::SdpType::Offer;
</del><ins>+ return type == RTCSdpType::Offer;
</ins><span class="cx"> case RTCSignalingState::HaveLocalOffer:
</span><del>- return type == RTCSessionDescription::SdpType::Answer || type == RTCSessionDescription::SdpType::Pranswer;
</del><ins>+ return type == RTCSdpType::Answer || type == RTCSdpType::Pranswer;
</ins><span class="cx"> case RTCSignalingState::HaveRemoteOffer:
</span><del>- return type == RTCSessionDescription::SdpType::Offer;
</del><ins>+ return type == RTCSdpType::Offer;
</ins><span class="cx"> case RTCSignalingState::HaveRemotePranswer:
</span><del>- return type == RTCSessionDescription::SdpType::Answer || type == RTCSessionDescription::SdpType::Pranswer;
</del><ins>+ return type == RTCSdpType::Answer || type == RTCSdpType::Pranswer;
</ins><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamPeerConnectionBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="cx"> #include "JSDOMPromise.h"
</span><del>-#include "RTCEnums.h"
</del><ins>+#include "RTCSignalingState.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/RTCConfiguration.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -33,8 +33,9 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><del>-#include "RTCEnums.h"
</del><ins>+#include "RTCBundlePolicy.h"
</ins><span class="cx"> #include "RTCIceServer.h"
</span><ins>+#include "RTCIceTransportPolicy.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCEnumsh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/mediastream/RTCEnums.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCEnums.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/RTCEnums.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-/*
- * Copyright (C) 2017 Apple Inc. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
- */
-
-#pragma once
-
-#include "PeerConnectionStates.h"
-#include "RTCRtpTransceiverDirection.h"
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceConnectionStateh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/mediastream/RTCIceConnectionState.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceConnectionState.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceConnectionState.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-/*
- * Copyright (C) 2017 Apple Inc. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
- */
-
-#pragma once
-
-#include "PeerConnectionStates.h"
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceGatheringStateh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/mediastream/RTCIceGatheringState.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceGatheringState.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceGatheringState.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-/*
- * Copyright (C) 2017 Apple Inc. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
- */
-
-#pragma once
-
-#include "PeerConnectionStates.h"
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceTransporth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCIceTransport.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceTransport.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceTransport.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -33,7 +33,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><del>-#include "RTCEnums.h"
</del><ins>+#include "RTCIceGatheringState.h"
+#include "RTCIceTransportState.h"
</ins><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCIceTransportStateh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/mediastream/RTCIceTransportState.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCIceTransportState.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceTransportState.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-/*
- * Copyright (C) 2017 Apple Inc. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
- */
-
-#pragma once
-
-#include "PeerConnectionStates.h"
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx">
</span><span class="cx"> void RTCPeerConnection::completeAddTransceiver(RTCRtpTransceiver& transceiver, const RTCRtpTransceiverInit& init)
</span><span class="cx"> {
</span><del>- transceiver.setDirection(static_cast<RTCRtpTransceiver::Direction>(init.direction));
</del><ins>+ transceiver.setDirection(init.direction);
</ins><span class="cx">
</span><span class="cx"> m_transceiverSet->append(transceiver);
</span><span class="cx"> m_backend->markAsNeedingNegotiation();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -40,8 +40,10 @@
</span><span class="cx"> #include "MediaStream.h"
</span><span class="cx"> #include "RTCConfiguration.h"
</span><span class="cx"> #include "RTCDataChannel.h"
</span><del>-#include "RTCEnums.h"
</del><ins>+#include "RTCIceConnectionState.h"
+#include "RTCIceGatheringState.h"
</ins><span class="cx"> #include "RTCRtpTransceiver.h"
</span><ins>+#include "RTCSignalingState.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+typedef RTCRtpTransceiverDirection RtpTransceiverDirection;
+
</ins><span class="cx"> [
</span><span class="cx"> Conditional=WEB_RTC,
</span><span class="cx"> EnabledAtRuntime=PeerConnection
</span><span class="lines">@@ -50,7 +52,7 @@
</span><span class="cx"> EnabledAtRuntime=PeerConnection,
</span><span class="cx"> ImplementedAs=RTCRtpTransceiverInit
</span><span class="cx"> ] dictionary RTCRtpTransceiverInit {
</span><del>- RTCRtpTransceiverDirection direction = "sendrecv";
</del><ins>+ RtpTransceiverDirection direction = "sendrecv";
</ins><span class="cx"> // FIXME 169662: missing streams
</span><span class="cx"> // FIXME 169662: missing sendEncodings
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpTransceivercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.cpp (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.cpp 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.cpp 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2016 Ericsson AB. All rights reserved.
</span><ins>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -56,7 +57,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RTCRtpTransceiver::RTCRtpTransceiver(Ref<RTCRtpSender>&& sender, Ref<RTCRtpReceiver>&& receiver)
</span><del>- : m_direction(Direction::Sendrecv)
</del><ins>+ : m_direction(RTCRtpTransceiverDirection::Sendrecv)
</ins><span class="cx"> , m_sender(WTFMove(sender))
</span><span class="cx"> , m_receiver(WTFMove(receiver))
</span><span class="cx"> , m_iceTransport(RTCIceTransport::create())
</span><span class="lines">@@ -66,10 +67,14 @@
</span><span class="cx"> const String& RTCRtpTransceiver::directionString() const
</span><span class="cx"> {
</span><span class="cx"> switch (m_direction) {
</span><del>- case Direction::Sendrecv: return sendrecvString();
- case Direction::Sendonly: return sendonlyString();
- case Direction::Recvonly: return recvonlyString();
- case Direction::Inactive: return inactiveString();
</del><ins>+ case RTCRtpTransceiverDirection::Sendrecv:
+ return sendrecvString();
+ case RTCRtpTransceiverDirection::Sendonly:
+ return sendonlyString();
+ case RTCRtpTransceiverDirection::Recvonly:
+ return recvonlyString();
+ case RTCRtpTransceiverDirection::Inactive:
+ return inactiveString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -78,23 +83,23 @@
</span><span class="cx">
</span><span class="cx"> bool RTCRtpTransceiver::hasSendingDirection() const
</span><span class="cx"> {
</span><del>- return m_direction == Direction::Sendrecv || m_direction == Direction::Sendonly;
</del><ins>+ return m_direction == RTCRtpTransceiverDirection::Sendrecv || m_direction == RTCRtpTransceiverDirection::Sendonly;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCRtpTransceiver::enableSendingDirection()
</span><span class="cx"> {
</span><del>- if (m_direction == Direction::Recvonly)
- m_direction = Direction::Sendrecv;
- else if (m_direction == Direction::Inactive)
- m_direction = Direction::Sendonly;
</del><ins>+ if (m_direction == RTCRtpTransceiverDirection::Recvonly)
+ m_direction = RTCRtpTransceiverDirection::Sendrecv;
+ else if (m_direction == RTCRtpTransceiverDirection::Inactive)
+ m_direction = RTCRtpTransceiverDirection::Sendonly;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCRtpTransceiver::disableSendingDirection()
</span><span class="cx"> {
</span><del>- if (m_direction == Direction::Sendrecv)
- m_direction = Direction::Recvonly;
- else if (m_direction == Direction::Sendonly)
- m_direction = Direction::Inactive;
</del><ins>+ if (m_direction == RTCRtpTransceiverDirection::Sendrecv)
+ m_direction = RTCRtpTransceiverDirection::Recvonly;
+ else if (m_direction == RTCRtpTransceiverDirection::Sendonly)
+ m_direction = RTCRtpTransceiverDirection::Inactive;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RtpTransceiverSet::append(Ref<RTCRtpTransceiver>&& transceiver)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpTransceiverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiver.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2016 Ericsson AB. All rights reserved.
</span><ins>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -32,10 +33,10 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><del>-#include "RTCEnums.h"
</del><span class="cx"> #include "RTCIceTransport.h"
</span><span class="cx"> #include "RTCRtpReceiver.h"
</span><span class="cx"> #include "RTCRtpSender.h"
</span><ins>+#include "RTCRtpTransceiverDirection.h"
</ins><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -45,9 +46,6 @@
</span><span class="cx">
</span><span class="cx"> class RTCRtpTransceiver : public RefCounted<RTCRtpTransceiver>, public ScriptWrappable {
</span><span class="cx"> public:
</span><del>- // This enum is mirrored in RTCPeerConnection.h
- using Direction = RTCRtpTransceiverDirection;
-
</del><span class="cx"> static Ref<RTCRtpTransceiver> create(Ref<RTCRtpSender>&& sender, Ref<RTCRtpReceiver>&& receiver) { return adoptRef(*new RTCRtpTransceiver(WTFMove(sender), WTFMove(receiver))); }
</span><span class="cx"> virtual ~RTCRtpTransceiver() { }
</span><span class="cx">
</span><span class="lines">@@ -56,8 +54,8 @@
</span><span class="cx"> void disableSendingDirection();
</span><span class="cx">
</span><span class="cx"> const String& directionString() const;
</span><del>- Direction direction() const { return m_direction; }
- void setDirection(Direction direction) { m_direction = direction; }
</del><ins>+ RTCRtpTransceiverDirection direction() const { return m_direction; }
+ void setDirection(RTCRtpTransceiverDirection direction) { m_direction = direction; }
</ins><span class="cx">
</span><span class="cx"> const String& provisionalMid() const { return m_provisionalMid; }
</span><span class="cx"> void setProvisionalMid(const String& provisionalMid) { m_provisionalMid = provisionalMid; }
</span><span class="lines">@@ -84,7 +82,7 @@
</span><span class="cx"> String m_provisionalMid;
</span><span class="cx"> String m_mid;
</span><span class="cx">
</span><del>- Direction m_direction;
</del><ins>+ RTCRtpTransceiverDirection m_direction;
</ins><span class="cx">
</span><span class="cx"> Ref<RTCRtpSender> m_sender;
</span><span class="cx"> Ref<RTCRtpReceiver> m_receiver;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCRtpTransceiverDirectionh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiverDirection.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiverDirection.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiverDirection.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-/*
- * Copyright (C) 2017 Apple Inc. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
- */
-
-#pragma once
-
-#if ENABLE(WEB_RTC)
-
-namespace WebCore {
-
-enum class RTCRtpTransceiverDirection {
- Sendrecv,
- Sendonly,
- Recvonly,
- Inactive
-};
-
-} // namespace WebCore
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCSessionDescriptioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2012 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
</span><ins>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -36,20 +37,20 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-inline RTCSessionDescription::RTCSessionDescription(SdpType type, const String& sdp)
</del><ins>+inline RTCSessionDescription::RTCSessionDescription(RTCSdpType type, String&& sdp)
</ins><span class="cx"> : m_type(type)
</span><del>- , m_sdp(sdp)
</del><ins>+ , m_sdp(WTFMove(sdp))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<RTCSessionDescription> RTCSessionDescription::create(const Init& dictionary)
</del><ins>+Ref<RTCSessionDescription> RTCSessionDescription::create(Init&& dictionary)
</ins><span class="cx"> {
</span><del>- return create(dictionary.type, dictionary.sdp);
</del><ins>+ return create(dictionary.type, WTFMove(dictionary.sdp));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<RTCSessionDescription> RTCSessionDescription::create(SdpType type, const String& sdp)
</del><ins>+Ref<RTCSessionDescription> RTCSessionDescription::create(RTCSdpType type, String&& sdp)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new RTCSessionDescription(type, sdp));
</del><ins>+ return adoptRef(*new RTCSessionDescription(type, WTFMove(sdp)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2012 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -33,6 +34,7 @@
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="cx"> #include "ExceptionOr.h"
</span><ins>+#include "RTCSdpType.h"
</ins><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -39,24 +41,23 @@
</span><span class="cx">
</span><span class="cx"> class RTCSessionDescription : public RefCounted<RTCSessionDescription>, public ScriptWrappable {
</span><span class="cx"> public:
</span><del>- enum class SdpType { Offer, Pranswer, Answer, Rollback };
</del><span class="cx">
</span><span class="cx"> struct Init {
</span><del>- SdpType type;
</del><ins>+ RTCSdpType type;
</ins><span class="cx"> String sdp;
</span><span class="cx"> };
</span><del>- static Ref<RTCSessionDescription> create(const Init&);
- static Ref<RTCSessionDescription> create(SdpType, const String& sdp);
</del><ins>+ static Ref<RTCSessionDescription> create(Init&&);
+ static Ref<RTCSessionDescription> create(RTCSdpType, String&& sdp);
</ins><span class="cx">
</span><del>- SdpType type() const { return m_type; }
</del><ins>+ RTCSdpType type() const { return m_type; }
</ins><span class="cx">
</span><span class="cx"> const String& sdp() const { return m_sdp; }
</span><span class="cx"> void setSdp(const String& sdp) { m_sdp = sdp; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit RTCSessionDescription(SdpType, const String& sdp);
</del><ins>+ RTCSessionDescription(RTCSdpType, String&& sdp);
</ins><span class="cx">
</span><del>- SdpType m_type;
</del><ins>+ RTCSdpType m_type;
</ins><span class="cx"> String m_sdp;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCSessionDescriptionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -31,6 +31,17 @@
</span><span class="cx">
</span><span class="cx"> [
</span><span class="cx"> Conditional=WEB_RTC,
</span><ins>+ EnabledAtRuntime=PeerConnection,
+ ImplementedAs=RTCSdpType
+] enum RTCSdpType {
+ "offer",
+ "pranswer",
+ "answer",
+ "rollback"
+};
+
+[
+ Conditional=WEB_RTC,
</ins><span class="cx"> Constructor(RTCSessionDescriptionInit descriptionInitDict),
</span><span class="cx"> EnabledAtRuntime=PeerConnection,
</span><span class="cx"> ImplementationLacksVTable,
</span><span class="lines">@@ -43,8 +54,6 @@
</span><span class="cx"> serializer = {type, sdp};
</span><span class="cx"> };
</span><span class="cx">
</span><del>-enum RTCSdpType { "offer", "pranswer", "answer", "rollback" };
-
</del><span class="cx"> dictionary RTCSessionDescriptionInit {
</span><span class="cx"> required RTCSdpType type;
</span><span class="cx"> DOMString sdp = "";
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCSignalingStateh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/mediastream/RTCSignalingState.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCSignalingState.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSignalingState.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-/*
- * Copyright (C) 2017 Apple Inc. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
- */
-
-#pragma once
-
-#include "PeerConnectionStates.h"
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCDataChannelHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2017 Apple Inc.
</del><ins>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include "PlatformStrategies.h"
</span><span class="cx"> #include "RTCDataChannel.h"
</span><span class="cx"> #include "RTCDataChannelEvent.h"
</span><del>-#include "RTCEnums.h"
</del><span class="cx"> #include "RTCPeerConnection.h"
</span><span class="cx"> #include "RTCSessionDescription.h"
</span><span class="cx"> #include "RTCStatsReport.h"
</span><span class="lines">@@ -66,29 +65,30 @@
</span><span class="cx"> ASSERT(m_backend);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline const char* sessionDescriptionType(RTCSessionDescription::SdpType sdpType)
</del><ins>+// FIXME: unify with MediaEndpointSessionDescription::typeString()
+static inline const char* sessionDescriptionType(RTCSdpType sdpType)
</ins><span class="cx"> {
</span><span class="cx"> switch (sdpType) {
</span><del>- case RTCSessionDescription::SdpType::Offer:
</del><ins>+ case RTCSdpType::Offer:
</ins><span class="cx"> return "offer";
</span><del>- case RTCSessionDescription::SdpType::Pranswer:
</del><ins>+ case RTCSdpType::Pranswer:
</ins><span class="cx"> return "pranswer";
</span><del>- case RTCSessionDescription::SdpType::Answer:
</del><ins>+ case RTCSdpType::Answer:
</ins><span class="cx"> return "answer";
</span><del>- case RTCSessionDescription::SdpType::Rollback:
</del><ins>+ case RTCSdpType::Rollback:
</ins><span class="cx"> return "rollback";
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline RTCSessionDescription::SdpType fromSessionDescriptionType(const webrtc::SessionDescriptionInterface& description)
</del><ins>+static inline RTCSdpType fromSessionDescriptionType(const webrtc::SessionDescriptionInterface& description)
</ins><span class="cx"> {
</span><span class="cx"> auto type = description.type();
</span><span class="cx"> if (type == webrtc::SessionDescriptionInterface::kOffer)
</span><del>- return RTCSessionDescription::SdpType::Offer;
</del><ins>+ return RTCSdpType::Offer;
</ins><span class="cx"> if (type == webrtc::SessionDescriptionInterface::kAnswer)
</span><del>- return RTCSessionDescription::SdpType::Answer;
</del><ins>+ return RTCSdpType::Answer;
</ins><span class="cx"> ASSERT(type == webrtc::SessionDescriptionInterface::kPrAnswer);
</span><del>- return RTCSessionDescription::SdpType::Pranswer;
</del><ins>+ return RTCSdpType::Pranswer;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline RefPtr<RTCSessionDescription> fromSessionDescription(const webrtc::SessionDescriptionInterface* description)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2017 Apple Inc.
</del><ins>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCPeerConnectionBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2017 Apple Inc.
</del><ins>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1348,6 +1348,12 @@
</span><span class="cx"> 312C0C41146DC6CC0016C911 /* Notification.h in Headers */ = {isa = PBXBuildFile; fileRef = 333F704F0FB49CA2008E12A6 /* Notification.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 31313F651443B35F006E2A90 /* FilterEffectRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31313F631443B35E006E2A90 /* FilterEffectRenderer.cpp */; };
</span><span class="cx"> 31313F661443B35F006E2A90 /* FilterEffectRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 31313F641443B35E006E2A90 /* FilterEffectRenderer.h */; };
</span><ins>+ 313591061E7DDC7300F30630 /* RTCIceConnectionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 313591001E7DDC6000F30630 /* RTCIceConnectionState.h */; };
+ 313591071E7DDC7300F30630 /* RTCIceGatheringState.h in Headers */ = {isa = PBXBuildFile; fileRef = 313591011E7DDC6000F30630 /* RTCIceGatheringState.h */; };
+ 313591081E7DDC7300F30630 /* RTCIceTransportPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 313591021E7DDC6000F30630 /* RTCIceTransportPolicy.h */; };
+ 313591091E7DDC7300F30630 /* RTCIceTransportState.h in Headers */ = {isa = PBXBuildFile; fileRef = 313591031E7DDC6000F30630 /* RTCIceTransportState.h */; };
+ 3135910A1E7DDC7300F30630 /* RTCSdpType.h in Headers */ = {isa = PBXBuildFile; fileRef = 313591041E7DDC6000F30630 /* RTCSdpType.h */; };
+ 3135910B1E7DDC7300F30630 /* RTCSignalingState.h in Headers */ = {isa = PBXBuildFile; fileRef = 313591051E7DDC6000F30630 /* RTCSignalingState.h */; };
</ins><span class="cx"> 3140379B124BEA7F00AF40E4 /* WebCoreMotionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 31403797124BEA7F00AF40E4 /* WebCoreMotionManager.h */; };
</span><span class="cx"> 3140379C124BEA7F00AF40E4 /* WebCoreMotionManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31403798124BEA7F00AF40E4 /* WebCoreMotionManager.mm */; };
</span><span class="cx"> 3140379D124BEA7F00AF40E4 /* DeviceOrientationClientIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 31403799124BEA7F00AF40E4 /* DeviceOrientationClientIOS.h */; };
</span><span class="lines">@@ -1426,9 +1432,6 @@
</span><span class="cx"> 316DCB221E78CA55001B5F87 /* JSRTCRtpTransceiverDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB1C1E78CA55001B5F87 /* JSRTCRtpTransceiverDirection.h */; };
</span><span class="cx"> 316DCB311E78FB6C001B5F87 /* JSRTCAnswerOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316DCB2D1E78F496001B5F87 /* JSRTCAnswerOptions.cpp */; };
</span><span class="cx"> 316DCB321E78FB70001B5F87 /* JSRTCOfferOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316DCB2F1E78F496001B5F87 /* JSRTCOfferOptions.cpp */; };
</span><del>- 316DCB371E790E1B001B5F87 /* RTCIceGatheringState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB341E790E1B001B5F87 /* RTCIceGatheringState.h */; };
- 316DCB3D1E790E2C001B5F87 /* RTCIceConnectionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB3A1E790E2C001B5F87 /* RTCIceConnectionState.h */; };
- 316DCB431E790E3C001B5F87 /* RTCSignalingState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB401E790E3C001B5F87 /* RTCSignalingState.h */; };
</del><span class="cx"> 316DCB4B1E7910A6001B5F87 /* JSRTCIceConnectionState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316DCB451E7910A6001B5F87 /* JSRTCIceConnectionState.cpp */; };
</span><span class="cx"> 316DCB4C1E7910A6001B5F87 /* JSRTCIceConnectionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB461E7910A6001B5F87 /* JSRTCIceConnectionState.h */; };
</span><span class="cx"> 316DCB4D1E7910A6001B5F87 /* JSRTCIceGatheringState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316DCB471E7910A6001B5F87 /* JSRTCIceGatheringState.cpp */; };
</span><span class="lines">@@ -1436,7 +1439,6 @@
</span><span class="cx"> 316DCB4F1E7910A6001B5F87 /* JSRTCSignalingState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316DCB491E7910A6001B5F87 /* JSRTCSignalingState.cpp */; };
</span><span class="cx"> 316DCB501E7910A6001B5F87 /* JSRTCSignalingState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB4A1E7910A6001B5F87 /* JSRTCSignalingState.h */; };
</span><span class="cx"> 316DCB8A1E7A6996001B5F87 /* RTCIceTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316DCB881E7A6996001B5F87 /* RTCIceTransport.cpp */; };
</span><del>- 316DCB901E7A6C79001B5F87 /* RTCIceTransportState.h in Headers */ = {isa = PBXBuildFile; fileRef = 316DCB8D1E7A6C79001B5F87 /* RTCIceTransportState.h */; };
</del><span class="cx"> 316FE0710E6CCBEE00BF6088 /* JSCSSKeyframeRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316FE06D0E6CCBEE00BF6088 /* JSCSSKeyframeRule.cpp */; };
</span><span class="cx"> 316FE0720E6CCBEE00BF6088 /* JSCSSKeyframeRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE06E0E6CCBEE00BF6088 /* JSCSSKeyframeRule.h */; };
</span><span class="cx"> 316FE0730E6CCBEE00BF6088 /* JSCSSKeyframesRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316FE06F0E6CCBEE00BF6088 /* JSCSSKeyframesRule.cpp */; };
</span><span class="lines">@@ -1551,6 +1553,7 @@
</span><span class="cx"> 31DF63571AF187DD0078FD91 /* NSColorSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 31DF63561AF187DD0078FD91 /* NSColorSPI.h */; };
</span><span class="cx"> 31EAF97E121435A400E7C1BF /* DeviceMotionClientIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 31EAF97C121435A400E7C1BF /* DeviceMotionClientIOS.h */; };
</span><span class="cx"> 31EAF97F121435A400E7C1BF /* DeviceMotionClientIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31EAF97D121435A400E7C1BF /* DeviceMotionClientIOS.mm */; };
</span><ins>+ 31EB54DF1E7DC74400C1623B /* RTCRtpTransceiverDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 31EB54DD1E7DC74400C1623B /* RTCRtpTransceiverDirection.h */; };
</ins><span class="cx"> 31EC1E2814FF60EE00C94662 /* JSNotificationPermissionCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31EC1E2614FF60EE00C94662 /* JSNotificationPermissionCallback.cpp */; };
</span><span class="cx"> 31EC1E2914FF60EE00C94662 /* JSNotificationPermissionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 31EC1E2714FF60EE00C94662 /* JSNotificationPermissionCallback.h */; };
</span><span class="cx"> 31FB1A57120A5D0600DC02A0 /* DeviceMotionClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 31FB1A4F120A5D0600DC02A0 /* DeviceMotionClient.h */; };
</span><span class="lines">@@ -1698,7 +1701,6 @@
</span><span class="cx"> 415080371E3F00B00051D75D /* LibWebRTCAudioModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 415080351E3F00AA0051D75D /* LibWebRTCAudioModule.h */; };
</span><span class="cx"> 4150F9F112B6E0E70008C860 /* SliderThumbElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4150F9EF12B6E0E70008C860 /* SliderThumbElement.h */; };
</span><span class="cx"> 4150F9F212B6E0E70008C860 /* SliderThumbElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4150F9F012B6E0E70008C860 /* SliderThumbElement.cpp */; };
</span><del>- 415670471DBE1533009AC3BB /* PeerConnectionStates.h in Headers */ = {isa = PBXBuildFile; fileRef = 415670461DBE1524009AC3BB /* PeerConnectionStates.h */; };
</del><span class="cx"> 415747471E3869A400E914D8 /* LibWebRTCMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 415747431E38699E00E914D8 /* LibWebRTCMacros.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 415747481E3869A700E914D8 /* LibWebRTCProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 415747441E38699E00E914D8 /* LibWebRTCProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 4157AF8012F1FB0400A8C6F5 /* MediaControlsApple.h in Headers */ = {isa = PBXBuildFile; fileRef = 4157AF7E12F1FB0400A8C6F5 /* MediaControlsApple.h */; };
</span><span class="lines">@@ -8844,6 +8846,13 @@
</span><span class="cx"> 3128CA6A147331630074C72A /* NotificationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationController.h; sourceTree = "<group>"; };
</span><span class="cx"> 31313F631443B35E006E2A90 /* FilterEffectRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FilterEffectRenderer.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 31313F641443B35E006E2A90 /* FilterEffectRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilterEffectRenderer.h; sourceTree = "<group>"; };
</span><ins>+ 313591001E7DDC6000F30630 /* RTCIceConnectionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCIceConnectionState.h; sourceTree = "<group>"; };
+ 313591011E7DDC6000F30630 /* RTCIceGatheringState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCIceGatheringState.h; sourceTree = "<group>"; };
+ 313591021E7DDC6000F30630 /* RTCIceTransportPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCIceTransportPolicy.h; sourceTree = "<group>"; };
+ 313591031E7DDC6000F30630 /* RTCIceTransportState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCIceTransportState.h; sourceTree = "<group>"; };
+ 313591041E7DDC6000F30630 /* RTCSdpType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCSdpType.h; sourceTree = "<group>"; };
+ 313591051E7DDC6000F30630 /* RTCSignalingState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCSignalingState.h; sourceTree = "<group>"; };
+ 3135910C1E7DDCB600F30630 /* RTCBundlePolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCBundlePolicy.h; sourceTree = "<group>"; };
</ins><span class="cx"> 31403797124BEA7F00AF40E4 /* WebCoreMotionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreMotionManager.h; sourceTree = "<group>"; };
</span><span class="cx"> 31403798124BEA7F00AF40E4 /* WebCoreMotionManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreMotionManager.mm; sourceTree = "<group>"; };
</span><span class="cx"> 31403799124BEA7F00AF40E4 /* DeviceOrientationClientIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceOrientationClientIOS.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -8918,9 +8927,7 @@
</span><span class="cx"> 316BDC091E76342700DE0D5A /* GPURenderPipelineColorAttachmentDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPURenderPipelineColorAttachmentDescriptor.h; sourceTree = "<group>"; };
</span><span class="cx"> 316BDC0A1E76343600DE0D5A /* GPURenderPipelineColorAttachmentDescriptorMetal.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPURenderPipelineColorAttachmentDescriptorMetal.mm; sourceTree = "<group>"; };
</span><span class="cx"> 316DCB121E78BE43001B5F87 /* RTCOfferAnswerOptions.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCOfferAnswerOptions.idl; sourceTree = "<group>"; };
</span><del>- 316DCB161E78C330001B5F87 /* RTCRtpTransceiverDirection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RTCRtpTransceiverDirection.h; sourceTree = "<group>"; };
</del><span class="cx"> 316DCB171E78C330001B5F87 /* RTCRtpTransceiverDirection.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = RTCRtpTransceiverDirection.idl; sourceTree = "<group>"; };
</span><del>- 316DCB181E78C453001B5F87 /* RTCEnums.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RTCEnums.h; sourceTree = "<group>"; };
</del><span class="cx"> 316DCB191E78CA55001B5F87 /* JSRTCOfferAnswerOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCOfferAnswerOptions.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 316DCB1A1E78CA55001B5F87 /* JSRTCOfferAnswerOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCOfferAnswerOptions.h; sourceTree = "<group>"; };
</span><span class="cx"> 316DCB1B1E78CA55001B5F87 /* JSRTCRtpTransceiverDirection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCRtpTransceiverDirection.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -8933,11 +8940,8 @@
</span><span class="cx"> 316DCB2E1E78F496001B5F87 /* JSRTCAnswerOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCAnswerOptions.h; sourceTree = "<group>"; };
</span><span class="cx"> 316DCB2F1E78F496001B5F87 /* JSRTCOfferOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCOfferOptions.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 316DCB301E78F496001B5F87 /* JSRTCOfferOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCOfferOptions.h; sourceTree = "<group>"; };
</span><del>- 316DCB341E790E1B001B5F87 /* RTCIceGatheringState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCIceGatheringState.h; sourceTree = "<group>"; };
</del><span class="cx"> 316DCB351E790E1B001B5F87 /* RTCIceGatheringState.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCIceGatheringState.idl; sourceTree = "<group>"; };
</span><del>- 316DCB3A1E790E2C001B5F87 /* RTCIceConnectionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCIceConnectionState.h; sourceTree = "<group>"; };
</del><span class="cx"> 316DCB3B1E790E2C001B5F87 /* RTCIceConnectionState.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCIceConnectionState.idl; sourceTree = "<group>"; };
</span><del>- 316DCB401E790E3C001B5F87 /* RTCSignalingState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCSignalingState.h; sourceTree = "<group>"; };
</del><span class="cx"> 316DCB411E790E3C001B5F87 /* RTCSignalingState.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCSignalingState.idl; sourceTree = "<group>"; };
</span><span class="cx"> 316DCB451E7910A6001B5F87 /* JSRTCIceConnectionState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCIceConnectionState.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 316DCB461E7910A6001B5F87 /* JSRTCIceConnectionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCIceConnectionState.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -8947,7 +8951,6 @@
</span><span class="cx"> 316DCB4A1E7910A6001B5F87 /* JSRTCSignalingState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCSignalingState.h; sourceTree = "<group>"; };
</span><span class="cx"> 316DCB881E7A6996001B5F87 /* RTCIceTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCIceTransport.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 316DCB891E7A6996001B5F87 /* RTCIceTransport.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCIceTransport.idl; sourceTree = "<group>"; };
</span><del>- 316DCB8D1E7A6C79001B5F87 /* RTCIceTransportState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCIceTransportState.h; sourceTree = "<group>"; };
</del><span class="cx"> 316DCB8E1E7A6C79001B5F87 /* RTCIceTransportState.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCIceTransportState.idl; sourceTree = "<group>"; };
</span><span class="cx"> 316FE06D0E6CCBEE00BF6088 /* JSCSSKeyframeRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSKeyframeRule.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 316FE06E0E6CCBEE00BF6088 /* JSCSSKeyframeRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSKeyframeRule.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -9113,6 +9116,7 @@
</span><span class="cx"> 31E8D8BB160BC94C004CE8F5 /* RenderSnapshottedPlugIn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSnapshottedPlugIn.h; sourceTree = "<group>"; };
</span><span class="cx"> 31EAF97C121435A400E7C1BF /* DeviceMotionClientIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceMotionClientIOS.h; sourceTree = "<group>"; };
</span><span class="cx"> 31EAF97D121435A400E7C1BF /* DeviceMotionClientIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DeviceMotionClientIOS.mm; sourceTree = "<group>"; };
</span><ins>+ 31EB54DD1E7DC74400C1623B /* RTCRtpTransceiverDirection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCRtpTransceiverDirection.h; sourceTree = "<group>"; };
</ins><span class="cx"> 31EC1D5014FEFD0800C94662 /* NotificationPermissionCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NotificationPermissionCallback.idl; sourceTree = "<group>"; };
</span><span class="cx"> 31EC1DAC14FF26EA00C94662 /* NotificationPermissionCallback.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NotificationPermissionCallback.h; sourceTree = "<group>"; };
</span><span class="cx"> 31EC1E2614FF60EE00C94662 /* JSNotificationPermissionCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNotificationPermissionCallback.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -9255,7 +9259,6 @@
</span><span class="cx"> 415080351E3F00AA0051D75D /* LibWebRTCAudioModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LibWebRTCAudioModule.h; path = libwebrtc/LibWebRTCAudioModule.h; sourceTree = "<group>"; };
</span><span class="cx"> 4150F9EF12B6E0E70008C860 /* SliderThumbElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SliderThumbElement.h; sourceTree = "<group>"; };
</span><span class="cx"> 4150F9F012B6E0E70008C860 /* SliderThumbElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SliderThumbElement.cpp; sourceTree = "<group>"; };
</span><del>- 415670461DBE1524009AC3BB /* PeerConnectionStates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PeerConnectionStates.h; sourceTree = "<group>"; };
</del><span class="cx"> 415747431E38699E00E914D8 /* LibWebRTCMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LibWebRTCMacros.h; path = libwebrtc/LibWebRTCMacros.h; sourceTree = "<group>"; };
</span><span class="cx"> 415747441E38699E00E914D8 /* LibWebRTCProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LibWebRTCProvider.h; path = libwebrtc/LibWebRTCProvider.h; sourceTree = "<group>"; };
</span><span class="cx"> 4157AF7E12F1FB0400A8C6F5 /* MediaControlsApple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaControlsApple.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -15914,7 +15917,6 @@
</span><span class="cx"> 07221B6C17CEC32700848E51 /* RTCDTMFToneChangeEvent.cpp */,
</span><span class="cx"> 07221B6D17CEC32700848E51 /* RTCDTMFToneChangeEvent.h */,
</span><span class="cx"> 07221B6E17CEC32700848E51 /* RTCDTMFToneChangeEvent.idl */,
</span><del>- 316DCB181E78C453001B5F87 /* RTCEnums.h */,
</del><span class="cx"> 07221B7117CEC32700848E51 /* RTCIceCandidate.cpp */,
</span><span class="cx"> 07221B7217CEC32700848E51 /* RTCIceCandidate.h */,
</span><span class="cx"> 07221B7317CEC32700848E51 /* RTCIceCandidate.idl */,
</span><span class="lines">@@ -15921,9 +15923,7 @@
</span><span class="cx"> 07221B7417CEC32700848E51 /* RTCIceCandidateEvent.cpp */,
</span><span class="cx"> 07221B7517CEC32700848E51 /* RTCIceCandidateEvent.h */,
</span><span class="cx"> 07221B7617CEC32700848E51 /* RTCIceCandidateEvent.idl */,
</span><del>- 316DCB3A1E790E2C001B5F87 /* RTCIceConnectionState.h */,
</del><span class="cx"> 316DCB3B1E790E2C001B5F87 /* RTCIceConnectionState.idl */,
</span><del>- 316DCB341E790E1B001B5F87 /* RTCIceGatheringState.h */,
</del><span class="cx"> 316DCB351E790E1B001B5F87 /* RTCIceGatheringState.idl */,
</span><span class="cx"> 07AB996718DA3C010018771E /* RTCIceServer.h */,
</span><span class="cx"> 07AB996818DA3C010018771E /* RTCIceServer.idl */,
</span><span class="lines">@@ -15930,7 +15930,6 @@
</span><span class="cx"> 316DCB881E7A6996001B5F87 /* RTCIceTransport.cpp */,
</span><span class="cx"> 5E6653091DA437BF00FDD84C /* RTCIceTransport.h */,
</span><span class="cx"> 316DCB891E7A6996001B5F87 /* RTCIceTransport.idl */,
</span><del>- 316DCB8D1E7A6C79001B5F87 /* RTCIceTransportState.h */,
</del><span class="cx"> 316DCB8E1E7A6C79001B5F87 /* RTCIceTransportState.idl */,
</span><span class="cx"> 073794DC19EE2C5200E5A045 /* RTCOfferAnswerOptions.h */,
</span><span class="cx"> 316DCB121E78BE43001B5F87 /* RTCOfferAnswerOptions.idl */,
</span><span class="lines">@@ -15951,12 +15950,10 @@
</span><span class="cx"> 5E5E2B101CFC3E4B000C0D85 /* RTCRtpTransceiver.cpp */,
</span><span class="cx"> 5E5E2B111CFC3E4B000C0D85 /* RTCRtpTransceiver.h */,
</span><span class="cx"> 5E5E2B121CFC3E4B000C0D85 /* RTCRtpTransceiver.idl */,
</span><del>- 316DCB161E78C330001B5F87 /* RTCRtpTransceiverDirection.h */,
</del><span class="cx"> 316DCB171E78C330001B5F87 /* RTCRtpTransceiverDirection.idl */,
</span><span class="cx"> 07221B7A17CEC32700848E51 /* RTCSessionDescription.cpp */,
</span><span class="cx"> 07221B7B17CEC32700848E51 /* RTCSessionDescription.h */,
</span><span class="cx"> 07221B7C17CEC32700848E51 /* RTCSessionDescription.idl */,
</span><del>- 316DCB401E790E3C001B5F87 /* RTCSignalingState.h */,
</del><span class="cx"> 316DCB411E790E3C001B5F87 /* RTCSignalingState.idl */,
</span><span class="cx"> 07221B8417CEC32700848E51 /* RTCStatsReport.h */,
</span><span class="cx"> 07221B8517CEC32700848E51 /* RTCStatsReport.idl */,
</span><span class="lines">@@ -15997,7 +15994,6 @@
</span><span class="cx"> 07221B9D17CF0AD400848E51 /* MediaStreamPrivate.h */,
</span><span class="cx"> 07FFDE66181AED420072D409 /* MediaStreamTrackPrivate.cpp */,
</span><span class="cx"> 07FFDE67181AED420072D409 /* MediaStreamTrackPrivate.h */,
</span><del>- 415670461DBE1524009AC3BB /* PeerConnectionStates.h */,
</del><span class="cx"> 5EBB89381C77BDA400C65D41 /* PeerMediaDescription.h */,
</span><span class="cx"> 4A4F656B1AA997F100E38CDD /* RealtimeMediaSource.cpp */,
</span><span class="cx"> 4A4F656C1AA997F100E38CDD /* RealtimeMediaSource.h */,
</span><span class="lines">@@ -16008,6 +16004,7 @@
</span><span class="cx"> 4A4F656F1AA997F100E38CDD /* RealtimeMediaSourceSettings.h */,
</span><span class="cx"> 2EC41DE21C0410A300D294FE /* RealtimeMediaSourceSupportedConstraints.cpp */,
</span><span class="cx"> 07C1C0E41BFB60ED00BD2256 /* RealtimeMediaSourceSupportedConstraints.h */,
</span><ins>+ 3135910C1E7DDCB600F30630 /* RTCBundlePolicy.h */,
</ins><span class="cx"> 07221BA217CF0AD400848E51 /* RTCDataChannelHandler.h */,
</span><span class="cx"> 07221BA317CF0AD400848E51 /* RTCDataChannelHandlerClient.h */,
</span><span class="cx"> 07221BA417CF0AD400848E51 /* RTCDTMFSenderHandler.h */,
</span><span class="lines">@@ -16014,10 +16011,17 @@
</span><span class="cx"> 07221BA517CF0AD400848E51 /* RTCDTMFSenderHandlerClient.h */,
</span><span class="cx"> 07221BA617CF0AD400848E51 /* RTCIceCandidateDescriptor.cpp */,
</span><span class="cx"> 07221BA717CF0AD400848E51 /* RTCIceCandidateDescriptor.h */,
</span><ins>+ 313591001E7DDC6000F30630 /* RTCIceConnectionState.h */,
+ 313591011E7DDC6000F30630 /* RTCIceGatheringState.h */,
+ 313591021E7DDC6000F30630 /* RTCIceTransportPolicy.h */,
+ 313591031E7DDC6000F30630 /* RTCIceTransportState.h */,
</ins><span class="cx"> 07221BAA17CF0AD400848E51 /* RTCPeerConnectionHandlerClient.h */,
</span><ins>+ 31EB54DD1E7DC74400C1623B /* RTCRtpTransceiverDirection.h */,
+ 313591041E7DDC6000F30630 /* RTCSdpType.h */,
</ins><span class="cx"> 07221BAB17CF0AD400848E51 /* RTCSessionDescriptionDescriptor.cpp */,
</span><span class="cx"> 07221BAC17CF0AD400848E51 /* RTCSessionDescriptionDescriptor.h */,
</span><span class="cx"> 07221BAD17CF0AD400848E51 /* RTCSessionDescriptionRequest.h */,
</span><ins>+ 313591051E7DDC6000F30630 /* RTCSignalingState.h */,
</ins><span class="cx"> 07221BB017CF0AD400848E51 /* RTCVoidRequest.h */,
</span><span class="cx"> 5EA3D6E51C85A9C300300BBB /* SDPProcessorScriptResource.cpp */,
</span><span class="cx"> 5EA3D6E61C85A9C300300BBB /* SDPProcessorScriptResource.h */,
</span><span class="lines">@@ -27074,6 +27078,7 @@
</span><span class="cx"> 2D8287F716E4A0380086BD00 /* HitTestLocation.h in Headers */,
</span><span class="cx"> 930908910AF7EDE40081DF01 /* HitTestRequest.h in Headers */,
</span><span class="cx"> 9307F1D80AF2D59000DBA31A /* HitTestResult.h in Headers */,
</span><ins>+ 313591071E7DDC7300F30630 /* RTCIceGatheringState.h in Headers */,
</ins><span class="cx"> 57E664FC1E73703300765536 /* CommonCryptoDERUtilities.h in Headers */,
</span><span class="cx"> BC3BC29C0E91AB0F00835588 /* HostWindow.h in Headers */,
</span><span class="cx"> FD31609912B026F700C1A359 /* HRTFDatabase.h in Headers */,
</span><span class="lines">@@ -27116,6 +27121,7 @@
</span><span class="cx"> A81369D4097374F600D74463 /* HTMLFieldSetElement.h in Headers */,
</span><span class="cx"> A8CFF7A60A156978000A4234 /* HTMLFontElement.h in Headers */,
</span><span class="cx"> 977B386F122883E900B81FF8 /* HTMLFormattingElementList.h in Headers */,
</span><ins>+ 3135910A1E7DDC7300F30630 /* RTCSdpType.h in Headers */,
</ins><span class="cx"> A81369CE097374F600D74463 /* HTMLFormControlElement.h in Headers */,
</span><span class="cx"> E14F1C4514B5DAC600EA9009 /* HTMLFormControlElementWithState.h in Headers */,
</span><span class="cx"> A8DF3FCE097FA0FC0052981B /* HTMLFormControlsCollection.h in Headers */,
</span><span class="lines">@@ -27254,7 +27260,6 @@
</span><span class="cx"> 5185FCA71BB4C4E80012898F /* IDBRecordIdentifier.h in Headers */,
</span><span class="cx"> 5185FCA91BB4C4E80012898F /* IDBRequest.h in Headers */,
</span><span class="cx"> 514129991C6976900059E714 /* IDBRequestCompletionEvent.h in Headers */,
</span><del>- 316DCB3D1E790E2C001B5F87 /* RTCIceConnectionState.h in Headers */,
</del><span class="cx"> 510A58FA1BACC7F200C19282 /* IDBRequestData.h in Headers */,
</span><span class="cx"> 5145B10A1BC48E2E00E86219 /* IDBResourceIdentifier.h in Headers */,
</span><span class="cx"> 51D7236D1BB6174900478CA3 /* IDBResultData.h in Headers */,
</span><span class="lines">@@ -27761,6 +27766,7 @@
</span><span class="cx"> 9001788112E0370700648462 /* JSOESStandardDerivatives.h in Headers */,
</span><span class="cx"> 6EBF0E7712A9868800DB1709 /* JSOESTextureFloat.h in Headers */,
</span><span class="cx"> 3146FE7518442370001A937C /* JSOESTextureFloatLinear.h in Headers */,
</span><ins>+ 313591061E7DDC7300F30630 /* RTCIceConnectionState.h in Headers */,
</ins><span class="cx"> A31C4E5416E02B40002F7957 /* JSOESTextureHalfFloat.h in Headers */,
</span><span class="cx"> 31078CCA1880AACE008099DC /* JSOESTextureHalfFloatLinear.h in Headers */,
</span><span class="cx"> 77A17AA712F28B2A004E02F6 /* JSOESVertexArrayObject.h in Headers */,
</span><span class="lines">@@ -27795,7 +27801,6 @@
</span><span class="cx"> 65DF320009D1CC60000BE325 /* JSProcessingInstruction.h in Headers */,
</span><span class="cx"> E44613EE0CD681BB00FADA75 /* JSProgressEvent.h in Headers */,
</span><span class="cx"> 077664FD183E6B5C00133B92 /* JSQuickTimePluginReplacement.h in Headers */,
</span><del>- 316DCB371E790E1B001B5F87 /* RTCIceGatheringState.h in Headers */,
</del><span class="cx"> B658FFA21522EF3A00DD5595 /* JSRadioNodeList.h in Headers */,
</span><span class="cx"> 65DF320209D1CC60000BE325 /* JSRange.h in Headers */,
</span><span class="cx"> 6C4C96DF1AD4483500363F64 /* JSReadableByteStreamController.h in Headers */,
</span><span class="lines">@@ -27905,6 +27910,7 @@
</span><span class="cx"> B2FA3D7F0AB75A6F000E5AC4 /* JSSVGFEFuncGElement.h in Headers */,
</span><span class="cx"> B2FA3D810AB75A6F000E5AC4 /* JSSVGFEFuncRElement.h in Headers */,
</span><span class="cx"> B2FA3D830AB75A6F000E5AC4 /* JSSVGFEGaussianBlurElement.h in Headers */,
</span><ins>+ 31EB54DF1E7DC74400C1623B /* RTCRtpTransceiverDirection.h in Headers */,
</ins><span class="cx"> B2FA3D850AB75A6F000E5AC4 /* JSSVGFEImageElement.h in Headers */,
</span><span class="cx"> B2FA3D870AB75A6F000E5AC4 /* JSSVGFEMergeElement.h in Headers */,
</span><span class="cx"> B2FA3D890AB75A6F000E5AC4 /* JSSVGFEMergeNodeElement.h in Headers */,
</span><span class="lines">@@ -28293,7 +28299,6 @@
</span><span class="cx"> FD671A78159BB07000197559 /* MediaStreamAudioSourceNode.h in Headers */,
</span><span class="cx"> 070F549817F12F6B00169E04 /* MediaStreamConstraintsValidationClient.h in Headers */,
</span><span class="cx"> 078E091617D14D1C00420AA1 /* MediaStreamEvent.h in Headers */,
</span><del>- 316DCB901E7A6C79001B5F87 /* RTCIceTransportState.h in Headers */,
</del><span class="cx"> 078E093717D16B2C00420AA1 /* MediaStreamPrivate.h in Headers */,
</span><span class="cx"> 078E091717D14D1C00420AA1 /* MediaStreamRegistry.h in Headers */,
</span><span class="cx"> 078E091817D14D1C00420AA1 /* MediaStreamTrack.h in Headers */,
</span><span class="lines">@@ -28521,7 +28526,6 @@
</span><span class="cx"> 1A8A64681D19FDFF00D0E00F /* PaymentRequestValidator.h in Headers */,
</span><span class="cx"> B27535650B053814002CE64F /* PDFDocumentImage.h in Headers */,
</span><span class="cx"> 5E2C43511BCEE2F60001E2BC /* PeerConnectionBackend.h in Headers */,
</span><del>- 415670471DBE1533009AC3BB /* PeerConnectionStates.h in Headers */,
</del><span class="cx"> 5EBB89391C77C39900C65D41 /* PeerMediaDescription.h in Headers */,
</span><span class="cx"> 8A7CC96B12076D73001D4588 /* PendingScript.h in Headers */,
</span><span class="cx"> E3FA38641D71812D00AA5950 /* PendingScriptClient.h in Headers */,
</span><span class="lines">@@ -28772,7 +28776,6 @@
</span><span class="cx"> 436708D512D9CA4B00044234 /* RenderSVGResourceFilterPrimitive.h in Headers */,
</span><span class="cx"> 436708D712D9CA4B00044234 /* RenderSVGResourceGradient.h in Headers */,
</span><span class="cx"> 436708D912D9CA4B00044234 /* RenderSVGResourceLinearGradient.h in Headers */,
</span><del>- 316DCB431E790E3C001B5F87 /* RTCSignalingState.h in Headers */,
</del><span class="cx"> 436708DB12D9CA4B00044234 /* RenderSVGResourceMarker.h in Headers */,
</span><span class="cx"> 436708DD12D9CA4B00044234 /* RenderSVGResourceMasker.h in Headers */,
</span><span class="cx"> 436708DF12D9CA4B00044234 /* RenderSVGResourcePattern.h in Headers */,
</span><span class="lines">@@ -29374,6 +29377,7 @@
</span><span class="cx"> E4AFD0100DAF335500F5F55C /* SVGSMILElement.h in Headers */,
</span><span class="cx"> 0880F70E1282B46D00948505 /* SVGStaticListPropertyTearOff.h in Headers */,
</span><span class="cx"> 0813A4EA1284132600992511 /* SVGStaticPropertyTearOff.h in Headers */,
</span><ins>+ 313591081E7DDC7300F30630 /* RTCIceTransportPolicy.h in Headers */,
</ins><span class="cx"> B2227AA90D00BF220071B782 /* SVGStopElement.h in Headers */,
</span><span class="cx"> B2227AAC0D00BF220071B782 /* SVGStringList.h in Headers */,
</span><span class="cx"> 7C39C3771DDBE17000FEFB29 /* SVGStringListValues.h in Headers */,
</span><span class="lines">@@ -29459,6 +29463,7 @@
</span><span class="cx"> 2D4F96F71A1ECC240098BF88 /* TextIndicatorWindow.h in Headers */,
</span><span class="cx"> F55B3DDA1251F12D003EF269 /* TextInputType.h in Headers */,
</span><span class="cx"> CECADFCE1537791D00E37068 /* TextInsertionBaseCommand.h in Headers */,
</span><ins>+ 3135910B1E7DDC7300F30630 /* RTCSignalingState.h in Headers */,
</ins><span class="cx"> 93309E1C099E64920056E581 /* TextIterator.h in Headers */,
</span><span class="cx"> 9392146918A6D791000EE688 /* TextIteratorBehavior.h in Headers */,
</span><span class="cx"> BCEF45E90E687767001C1287 /* TextMetrics.h in Headers */,
</span><span class="lines">@@ -29739,6 +29744,7 @@
</span><span class="cx"> 4A5A2ADC161E7E00005889DD /* WebSocketExtensionParser.h in Headers */,
</span><span class="cx"> 97AABD2414FA09D5007457AE /* WebSocketExtensionProcessor.h in Headers */,
</span><span class="cx"> 97AABD2514FA09D5007457AE /* WebSocketFrame.h in Headers */,
</span><ins>+ 313591091E7DDC7300F30630 /* RTCIceTransportState.h in Headers */,
</ins><span class="cx"> 97AABD2714FA09D5007457AE /* WebSocketHandshake.h in Headers */,
</span><span class="cx"> 1F8756B21E22C3350042C40D /* WebSQLiteDatabaseTrackerClient.h in Headers */,
</span><span class="cx"> 31DEA4561B39F4D900F77178 /* WebSystemBackdropLayer.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaEndpointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaEndpoint.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaEndpoint.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/platform/mediastream/MediaEndpoint.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx">
</span><span class="cx"> #include "MediaEndpointConfiguration.h"
</span><span class="cx"> #include "PeerConnectionBackend.h"
</span><ins>+#include "RTCIceTransportState.h"
</ins><span class="cx"> #include "RealtimeMediaSource.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaEndpointConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -33,7 +33,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><del>-#include "RTCEnums.h"
</del><ins>+#include "RTCBundlePolicy.h"
+#include "RTCIceTransportPolicy.h"
</ins><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamPeerConnectionStatesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/PeerConnectionStates.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/PeerConnectionStates.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/platform/mediastream/PeerConnectionStates.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -29,68 +29,28 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+// FIXME: Remove once older code is upgraded
</ins><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><ins>+#include "RTCBundlePolicy.h"
+#include "RTCIceConnectionState.h"
+#include "RTCIceGatheringState.h"
+#include "RTCIceTransportPolicy.h"
+#include "RTCIceTransportState.h"
+#include "RTCSignalingState.h"
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-enum class RTCSignalingState {
- Stable,
- HaveLocalOffer,
- HaveRemoteOffer,
- HaveLocalPranswer,
- HaveRemotePranswer,
- Closed
-};
-
-enum class RTCIceConnectionState {
- New,
- Checking,
- Connected,
- Completed,
- Failed,
- Disconnected,
- Closed
-};
-
-enum class RTCIceGatheringState {
- New,
- Gathering,
- Complete
-};
-
-enum class RTCIceTransportState {
- New,
- Checking,
- Connected,
- Completed,
- Failed,
- Disconnected,
- Closed
-};
-
-enum class RTCIceTransportPolicy {
- Relay,
- All
-};
-
-enum class RTCBundlePolicy {
- Balanced,
- MaxCompat,
- MaxBundle
-};
-
-
-// FIXME: Remove once older code is upgraded
</del><span class="cx"> namespace PeerConnectionStates {
</span><span class="cx">
</span><del>-using SignalingState = RTCSignalingState;
</del><ins>+using BundlePolicy = RTCBundlePolicy;
</ins><span class="cx"> using IceConnectionState = RTCIceConnectionState;
</span><span class="cx"> using IceGatheringState = RTCIceGatheringState;
</span><ins>+using IceTransportPolicy = RTCIceTransportPolicy;
</ins><span class="cx"> using IceTransportState = RTCIceTransportState;
</span><del>-using IceTransportPolicy = RTCIceTransportPolicy;
-using BundlePolicy = RTCBundlePolicy;
</del><ins>+using SignalingState = RTCSignalingState;
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCBundlePolicyhfromrev214211trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCDataChannelHandlerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/mediastream/RTCBundlePolicy.h (from rev 214211, trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h) (0 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCBundlePolicy.h (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/RTCBundlePolicy.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
+ */
+
+#pragma once
+
+#if ENABLE(WEB_RTC)
+
+namespace WebCore {
+
+enum class RTCBundlePolicy {
+ Balanced,
+ MaxCompat,
+ MaxBundle
+};
+
+}; // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCDTMFSenderHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCDTMFSenderHandler.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCDTMFSenderHandler.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/platform/mediastream/RTCDTMFSenderHandler.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,8 +24,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RTCDTMFSenderHandler_h
-#define RTCDTMFSenderHandler_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="lines">@@ -49,5 +49,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-
-#endif // RTCDTMFSenderHandler_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCDTMFSenderHandlerClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCDTMFSenderHandlerClient.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCDTMFSenderHandlerClient.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/platform/mediastream/RTCDTMFSenderHandlerClient.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,8 +24,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RTCDTMFSenderHandlerClient_h
-#define RTCDTMFSenderHandlerClient_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="lines">@@ -40,5 +40,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-
-#endif // RTCDTMFSenderHandlerClient_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCIceCandidateDescriptorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCIceCandidateDescriptor.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCIceCandidateDescriptor.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/platform/mediastream/RTCIceCandidateDescriptor.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2012 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -28,8 +29,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RTCIceCandidateDescriptor_h
-#define RTCIceCandidateDescriptor_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="lines">@@ -59,5 +59,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-
-#endif // RTCIceCandidateDescriptor_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCIceConnectionStatehfromrev214211trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCDataChannelHandlerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/mediastream/RTCIceConnectionState.h (from rev 214211, trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h) (0 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCIceConnectionState.h (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/RTCIceConnectionState.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
+ */
+
+#pragma once
+
+#if ENABLE(WEB_RTC)
+
+namespace WebCore {
+
+enum class RTCIceConnectionState {
+ New,
+ Checking,
+ Connected,
+ Completed,
+ Failed,
+ Disconnected,
+ Closed
+};
+
+}; // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCIceGatheringStatehfromrev214211trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCDataChannelHandlerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/mediastream/RTCIceGatheringState.h (from rev 214211, trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h) (0 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCIceGatheringState.h (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/RTCIceGatheringState.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
+ */
+
+#pragma once
+
+#if ENABLE(WEB_RTC)
+
+namespace WebCore {
+
+enum class RTCIceGatheringState {
+ New,
+ Gathering,
+ Complete
+};
+
+}; // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCIceTransportPolicyhfromrev214211trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCDataChannelHandlerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/mediastream/RTCIceTransportPolicy.h (from rev 214211, trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h) (0 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCIceTransportPolicy.h (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/RTCIceTransportPolicy.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
+ */
+
+#pragma once
+
+#if ENABLE(WEB_RTC)
+
+namespace WebCore {
+
+enum class RTCIceTransportPolicy {
+ Relay,
+ All
+};
+
+}; // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCIceTransportStatehfromrev214211trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCDataChannelHandlerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/mediastream/RTCIceTransportState.h (from rev 214211, trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h) (0 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCIceTransportState.h (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/RTCIceTransportState.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
+ */
+
+#pragma once
+
+#if ENABLE(WEB_RTC)
+
+namespace WebCore {
+
+enum class RTCIceTransportState {
+ New,
+ Checking,
+ Connected,
+ Completed,
+ Failed,
+ Disconnected,
+ Closed
+};
+
+}; // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCPeerConnectionHandlerClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2012 Google AB. All rights reserved.
</span><ins>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -28,8 +29,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RTCPeerConnectionHandlerClient_h
-#define RTCPeerConnectionHandlerClient_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="lines">@@ -83,5 +83,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-
-#endif // RTCPeerConnectionHandlerClient_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCRtpTransceiverDirectionhfromrev214211trunkSourceWebCoreModulesmediastreamRTCRtpTransceiverDirectionh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/mediastream/RTCRtpTransceiverDirection.h (from rev 214211, trunk/Source/WebCore/Modules/mediastream/RTCRtpTransceiverDirection.h) (0 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCRtpTransceiverDirection.h (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/RTCRtpTransceiverDirection.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
+ */
+
+#pragma once
+
+#if ENABLE(WEB_RTC)
+
+namespace WebCore {
+
+enum class RTCRtpTransceiverDirection {
+ Sendrecv,
+ Sendonly,
+ Recvonly,
+ Inactive
+};
+
+} // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCSdpTypehfromrev214211trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCDataChannelHandlerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/mediastream/RTCSdpType.h (from rev 214211, trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h) (0 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCSdpType.h (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/RTCSdpType.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
+ */
+
+#pragma once
+
+#if ENABLE(WEB_RTC)
+
+namespace WebCore {
+
+enum class RTCSdpType {
+ Offer,
+ Pranswer,
+ Answer,
+ Rollback
+};
+
+}; // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCSessionDescriptionDescriptorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2012 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -28,8 +29,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RTCSessionDescriptionDescriptor_h
-#define RTCSessionDescriptionDescriptor_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="lines">@@ -60,5 +60,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-
-#endif // RTCSessionDescriptionDescriptor_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCSessionDescriptionRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionRequest.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionRequest.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/platform/mediastream/RTCSessionDescriptionRequest.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2012 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -28,8 +29,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RTCSessionDescriptionRequest_h
-#define RTCSessionDescriptionRequest_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="lines">@@ -67,5 +67,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-
-#endif // RTCSessionDescriptionRequest_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCSignalingStatehfromrev214211trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCDataChannelHandlerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/mediastream/RTCSignalingState.h (from rev 214211, trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h) (0 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCSignalingState.h (rev 0)
+++ trunk/Source/WebCore/platform/mediastream/RTCSignalingState.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
+ */
+
+#pragma once
+
+#if ENABLE(WEB_RTC)
+
+namespace WebCore {
+
+enum class RTCSignalingState {
+ Stable,
+ HaveLocalOffer,
+ HaveRemoteOffer,
+ HaveLocalPranswer,
+ HaveRemotePranswer,
+ Closed
+};
+
+}; // namespace WebCore
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCVoidRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCVoidRequest.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCVoidRequest.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/platform/mediastream/RTCVoidRequest.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2012 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -28,8 +29,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RTCVoidRequest_h
-#define RTCVoidRequest_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="lines">@@ -52,5 +52,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-
-#endif // RTCVoidRequest_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockMediaEndpointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockMediaEndpoint.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockMediaEndpoint.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/platform/mock/MockMediaEndpoint.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="cx"> #include "MediaEndpoint.h"
</span><del>-#include "RTCEnums.h"
</del><ins>+#include "RTCIceTransportState.h"
</ins><span class="cx"> #include "Timer.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockRTCNotifiersMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/RTCNotifiersMock.h (214211 => 214212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/RTCNotifiersMock.h 2017-03-21 06:07:14 UTC (rev 214211)
+++ trunk/Source/WebCore/platform/mock/RTCNotifiersMock.h 2017-03-21 07:50:04 UTC (rev 214212)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
</del><ins>+ * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,8 +24,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RTCNotifiersMock_h
-#define RTCNotifiersMock_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><span class="lines">@@ -112,5 +112,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_RTC)
</span><del>-
-#endif // RTCNotifiersMock_h
</del></span></pre>
</div>
</div>
</body>
</html>