Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (214329 => 214330)
--- trunk/Source/WebCore/CMakeLists.txt 2017-03-24 01:36:06 UTC (rev 214329)
+++ trunk/Source/WebCore/CMakeLists.txt 2017-03-24 01:40:50 UTC (rev 214330)
@@ -240,7 +240,6 @@
Modules/mediastream/RTCDataChannel.idl
Modules/mediastream/RTCDataChannelEvent.idl
Modules/mediastream/RTCIceCandidate.idl
- Modules/mediastream/RTCIceCandidateEvent.idl
Modules/mediastream/RTCIceConnectionState.idl
Modules/mediastream/RTCIceGatheringState.idl
Modules/mediastream/RTCIceServer.idl
@@ -249,6 +248,7 @@
Modules/mediastream/RTCOfferAnswerOptions.idl
Modules/mediastream/RTCOfferOptions.idl
Modules/mediastream/RTCPeerConnection.idl
+ Modules/mediastream/RTCPeerConnectionIceEvent.idl
Modules/mediastream/RTCPeerConnectionState.idl
Modules/mediastream/RTCRtpReceiver.idl
Modules/mediastream/RTCRtpSender.idl
@@ -965,8 +965,8 @@
Modules/mediastream/RTCDataChannel.cpp
Modules/mediastream/RTCDataChannelEvent.cpp
Modules/mediastream/RTCIceCandidate.cpp
- Modules/mediastream/RTCIceCandidateEvent.cpp
Modules/mediastream/RTCPeerConnection.cpp
+ Modules/mediastream/RTCPeerConnectionIceEvent.cpp
Modules/mediastream/RTCRtpReceiver.cpp
Modules/mediastream/RTCRtpSender.cpp
Modules/mediastream/RTCRtpTransceiver.cpp
Modified: trunk/Source/WebCore/ChangeLog (214329 => 214330)
--- trunk/Source/WebCore/ChangeLog 2017-03-24 01:36:06 UTC (rev 214329)
+++ trunk/Source/WebCore/ChangeLog 2017-03-24 01:40:50 UTC (rev 214330)
@@ -1,3 +1,28 @@
+2017-03-23 Youenn Fablet <you...@apple.com>
+
+ Rename RTCIceCandidateEvent to RTCPeerConnectionIceEvent
+ https://bugs.webkit.org/show_bug.cgi?id=169981
+
+ Reviewed by Eric Carlson.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+ * Modules/mediastream/PeerConnectionBackend.cpp:
+ (WebCore::PeerConnectionBackend::fireICECandidateEvent):
+ (WebCore::PeerConnectionBackend::doneGatheringCandidates):
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ * Modules/mediastream/RTCPeerConnectionIceEvent.cpp: Renamed from Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.cpp.
+ (WebCore::RTCPeerConnectionIceEvent::create):
+ (WebCore::RTCPeerConnectionIceEvent::RTCPeerConnectionIceEvent):
+ (WebCore::RTCPeerConnectionIceEvent::~RTCPeerConnectionIceEvent):
+ (WebCore::RTCPeerConnectionIceEvent::candidate):
+ (WebCore::RTCPeerConnectionIceEvent::eventInterface):
+ * Modules/mediastream/RTCPeerConnectionIceEvent.h: Renamed from Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.h.
+ * Modules/mediastream/RTCPeerConnectionIceEvent.idl: Renamed from Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.idl.
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/EventNames.in:
+
2017-03-23 Michael Catanzaro <mcatanz...@igalia.com>
window.crypto.getRandomValues() uses the insecure RC4 RNG
Modified: trunk/Source/WebCore/DerivedSources.cpp (214329 => 214330)
--- trunk/Source/WebCore/DerivedSources.cpp 2017-03-24 01:36:06 UTC (rev 214329)
+++ trunk/Source/WebCore/DerivedSources.cpp 2017-03-24 01:40:50 UTC (rev 214330)
@@ -396,9 +396,9 @@
#include "JSRTCDTMFSender.cpp"
#include "JSRTCDTMFToneChangeEvent.cpp"
#include "JSRTCIceCandidate.cpp"
-#include "JSRTCIceCandidateEvent.cpp"
#include "JSRTCIceServer.cpp"
#include "JSRTCPeerConnection.cpp"
+#include "JSRTCPeerConnectionIceEvent.cpp"
#include "JSRTCRtpReceiver.cpp"
#include "JSRTCRtpSender.cpp"
#include "JSRTCSessionDescription.cpp"
Modified: trunk/Source/WebCore/DerivedSources.make (214329 => 214330)
--- trunk/Source/WebCore/DerivedSources.make 2017-03-24 01:36:06 UTC (rev 214329)
+++ trunk/Source/WebCore/DerivedSources.make 2017-03-24 01:40:50 UTC (rev 214330)
@@ -184,7 +184,7 @@
$(WebCore)/Modules/mediastream/RTCDataChannel.idl \
$(WebCore)/Modules/mediastream/RTCDataChannelEvent.idl \
$(WebCore)/Modules/mediastream/RTCIceCandidate.idl \
- $(WebCore)/Modules/mediastream/RTCIceCandidateEvent.idl \
+ $(WebCore)/Modules/mediastream/RTCPeerConnectionIceEvent.idl \
$(WebCore)/Modules/mediastream/RTCIceConnectionState.idl \
$(WebCore)/Modules/mediastream/RTCIceGatheringState.idl \
$(WebCore)/Modules/mediastream/RTCIceServer.idl \
Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (214329 => 214330)
--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2017-03-24 01:36:06 UTC (rev 214329)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2017-03-24 01:40:50 UTC (rev 214330)
@@ -46,9 +46,9 @@
#include "RTCAnswerOptions.h"
#include "RTCConfiguration.h"
#include "RTCIceCandidate.h"
-#include "RTCIceCandidateEvent.h"
#include "RTCOfferOptions.h"
#include "RTCPeerConnection.h"
+#include "RTCPeerConnectionIceEvent.h"
#include "RTCRtpTransceiver.h"
#include "RTCTrackEvent.h"
#include "SDPProcessor.h"
Modified: trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp (214329 => 214330)
--- trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2017-03-24 01:36:06 UTC (rev 214329)
+++ trunk/Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp 2017-03-24 01:40:50 UTC (rev 214330)
@@ -37,8 +37,8 @@
#include "EventNames.h"
#include "JSRTCSessionDescription.h"
#include "RTCIceCandidate.h"
-#include "RTCIceCandidateEvent.h"
#include "RTCPeerConnection.h"
+#include "RTCPeerConnectionIceEvent.h"
#include <wtf/text/StringBuilder.h>
namespace WebCore {
@@ -267,7 +267,7 @@
{
ASSERT(isMainThread());
- m_peerConnection.fireEvent(RTCIceCandidateEvent::create(false, false, WTFMove(candidate)));
+ m_peerConnection.fireEvent(RTCPeerConnectionIceEvent::create(false, false, WTFMove(candidate)));
}
void PeerConnectionBackend::enableICECandidateFiltering()
@@ -331,7 +331,7 @@
{
ASSERT(isMainThread());
- m_peerConnection.fireEvent(RTCIceCandidateEvent::create(false, false, nullptr));
+ m_peerConnection.fireEvent(RTCPeerConnectionIceEvent::create(false, false, nullptr));
m_peerConnection.updateIceGatheringState(RTCIceGatheringState::Complete);
}
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (214329 => 214330)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2017-03-24 01:36:06 UTC (rev 214329)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2017-03-24 01:40:50 UTC (rev 214330)
@@ -48,7 +48,7 @@
#include "RTCController.h"
#include "RTCDataChannel.h"
#include "RTCIceCandidate.h"
-#include "RTCIceCandidateEvent.h"
+#include "RTCPeerConnectionIceEvent.h"
#include "RTCSessionDescription.h"
#include "RTCTrackEvent.h"
#include "UUID.h"
Added: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.cpp (0 => 214330)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.cpp 2017-03-24 01:40:50 UTC (rev 214330)
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2012 Google 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.
+ */
+
+#include "config.h"
+#include "RTCPeerConnectionIceEvent.h"
+
+#if ENABLE(WEB_RTC)
+
+#include "EventNames.h"
+#include "RTCIceCandidate.h"
+
+namespace WebCore {
+
+Ref<RTCPeerConnectionIceEvent> RTCPeerConnectionIceEvent::create(bool canBubble, bool cancelable, RefPtr<RTCIceCandidate>&& candidate)
+{
+ return adoptRef(*new RTCPeerConnectionIceEvent(canBubble, cancelable, WTFMove(candidate)));
+}
+
+RTCPeerConnectionIceEvent::RTCPeerConnectionIceEvent(bool canBubble, bool cancelable, RefPtr<RTCIceCandidate>&& candidate)
+ : Event(eventNames().icecandidateEvent, canBubble, cancelable)
+ , m_candidate(WTFMove(candidate))
+{
+}
+
+RTCPeerConnectionIceEvent::~RTCPeerConnectionIceEvent()
+{
+}
+
+RTCIceCandidate* RTCPeerConnectionIceEvent::candidate() const
+{
+ return m_candidate.get();
+}
+
+EventInterface RTCPeerConnectionIceEvent::eventInterface() const
+{
+ return RTCPeerConnectionIceEventInterfaceType;
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WEB_RTC)
Added: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.h (0 => 214330)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.h (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.h 2017-03-24 01:40:50 UTC (rev 214330)
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2011 Google 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)
+
+#include "Event.h"
+#include <wtf/text/AtomicString.h>
+
+namespace WebCore {
+class RTCIceCandidate;
+
+class RTCPeerConnectionIceEvent : public Event {
+public:
+ virtual ~RTCPeerConnectionIceEvent();
+
+ static Ref<RTCPeerConnectionIceEvent> create(bool canBubble, bool cancelable, RefPtr<RTCIceCandidate>&&);
+
+ RTCIceCandidate* candidate() const;
+
+ virtual EventInterface eventInterface() const;
+
+private:
+ RTCPeerConnectionIceEvent(bool canBubble, bool cancelable, RefPtr<RTCIceCandidate>&&);
+
+ RefPtr<RTCIceCandidate> m_candidate;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(WEB_RTC)
Added: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.idl (0 => 214330)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.idl (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionIceEvent.idl 2017-03-24 01:40:50 UTC (rev 214330)
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ * 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.
+ */
+
+// FIXME 169662: missing Constructor(DOMString type, optional RTCPeerConnectionIceEventInit eventInitDict)
+[
+ NoInterfaceObject,
+ Conditional=WEB_RTC,
+ EnabledAtRuntime=PeerConnection
+] interface RTCPeerConnectionIceEvent : Event {
+ readonly attribute RTCIceCandidate? candidate;
+ // FIXME 169662: missing url
+};
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (214329 => 214330)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-03-24 01:36:06 UTC (rev 214329)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-03-24 01:40:50 UTC (rev 214330)
@@ -190,7 +190,7 @@
078E090717D14CEE00420AA1 /* RTCDTMFSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B6917CEC32700848E51 /* RTCDTMFSender.cpp */; };
078E090817D14CEE00420AA1 /* RTCDTMFToneChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B6C17CEC32700848E51 /* RTCDTMFToneChangeEvent.cpp */; };
078E090917D14CEE00420AA1 /* RTCIceCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B7117CEC32700848E51 /* RTCIceCandidate.cpp */; };
- 078E090A17D14CEE00420AA1 /* RTCIceCandidateEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B7417CEC32700848E51 /* RTCIceCandidateEvent.cpp */; };
+ 078E090A17D14CEE00420AA1 /* RTCPeerConnectionIceEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B7417CEC32700848E51 /* RTCPeerConnectionIceEvent.cpp */; };
078E090B17D14CEE00420AA1 /* RTCPeerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B7717CEC32700848E51 /* RTCPeerConnection.cpp */; };
078E090C17D14CEE00420AA1 /* RTCSessionDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B7A17CEC32700848E51 /* RTCSessionDescription.cpp */; };
078E091217D14CEE00420AA1 /* UserMediaController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B8E17CEC32700848E51 /* UserMediaController.cpp */; };
@@ -206,7 +206,7 @@
078E092017D14D1C00420AA1 /* RTCDTMFSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B6A17CEC32700848E51 /* RTCDTMFSender.h */; settings = {ATTRIBUTES = (Private, ); }; };
078E092117D14D1C00420AA1 /* RTCDTMFToneChangeEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B6D17CEC32700848E51 /* RTCDTMFToneChangeEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
078E092317D14D1C00420AA1 /* RTCIceCandidate.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B7217CEC32700848E51 /* RTCIceCandidate.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 078E092417D14D1C00420AA1 /* RTCIceCandidateEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B7517CEC32700848E51 /* RTCIceCandidateEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 078E092417D14D1C00420AA1 /* RTCPeerConnectionIceEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B7517CEC32700848E51 /* RTCPeerConnectionIceEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
078E092517D14D1C00420AA1 /* RTCPeerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B7817CEC32700848E51 /* RTCPeerConnection.h */; };
078E092617D14D1C00420AA1 /* RTCSessionDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B7B17CEC32700848E51 /* RTCSessionDescription.h */; settings = {ATTRIBUTES = (Private, ); }; };
078E092A17D14D1C00420AA1 /* RTCStatsReport.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B8417CEC32700848E51 /* RTCStatsReport.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -244,8 +244,8 @@
07969DB217D14151007FF842 /* JSRTCDTMFToneChangeEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07969D9817D14151007FF842 /* JSRTCDTMFToneChangeEvent.h */; };
07969DB517D14151007FF842 /* JSRTCIceCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07969D9B17D14151007FF842 /* JSRTCIceCandidate.cpp */; };
07969DB617D14151007FF842 /* JSRTCIceCandidate.h in Headers */ = {isa = PBXBuildFile; fileRef = 07969D9C17D14151007FF842 /* JSRTCIceCandidate.h */; };
- 07969DB717D14151007FF842 /* JSRTCIceCandidateEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07969D9D17D14151007FF842 /* JSRTCIceCandidateEvent.cpp */; };
- 07969DB817D14151007FF842 /* JSRTCIceCandidateEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07969D9E17D14151007FF842 /* JSRTCIceCandidateEvent.h */; };
+ 07969DB717D14151007FF842 /* JSRTCPeerConnectionIceEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07969D9D17D14151007FF842 /* JSRTCPeerConnectionIceEvent.cpp */; };
+ 07969DB817D14151007FF842 /* JSRTCPeerConnectionIceEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07969D9E17D14151007FF842 /* JSRTCPeerConnectionIceEvent.h */; };
07969DB917D14151007FF842 /* JSRTCPeerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07969D9F17D14151007FF842 /* JSRTCPeerConnection.cpp */; };
07969DBA17D14151007FF842 /* JSRTCPeerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 07969DA017D14151007FF842 /* JSRTCPeerConnection.h */; };
07969DBB17D14151007FF842 /* JSRTCSessionDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07969DA117D14151007FF842 /* JSRTCSessionDescription.cpp */; };
@@ -7429,9 +7429,9 @@
07221B7117CEC32700848E51 /* RTCIceCandidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCIceCandidate.cpp; sourceTree = "<group>"; };
07221B7217CEC32700848E51 /* RTCIceCandidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCIceCandidate.h; sourceTree = "<group>"; };
07221B7317CEC32700848E51 /* RTCIceCandidate.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCIceCandidate.idl; sourceTree = "<group>"; };
- 07221B7417CEC32700848E51 /* RTCIceCandidateEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCIceCandidateEvent.cpp; sourceTree = "<group>"; };
- 07221B7517CEC32700848E51 /* RTCIceCandidateEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCIceCandidateEvent.h; sourceTree = "<group>"; };
- 07221B7617CEC32700848E51 /* RTCIceCandidateEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCIceCandidateEvent.idl; sourceTree = "<group>"; };
+ 07221B7417CEC32700848E51 /* RTCPeerConnectionIceEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCPeerConnectionIceEvent.cpp; sourceTree = "<group>"; };
+ 07221B7517CEC32700848E51 /* RTCPeerConnectionIceEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCPeerConnectionIceEvent.h; sourceTree = "<group>"; };
+ 07221B7617CEC32700848E51 /* RTCPeerConnectionIceEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCPeerConnectionIceEvent.idl; sourceTree = "<group>"; };
07221B7717CEC32700848E51 /* RTCPeerConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCPeerConnection.cpp; sourceTree = "<group>"; };
07221B7817CEC32700848E51 /* RTCPeerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCPeerConnection.h; sourceTree = "<group>"; };
07221B7917CEC32700848E51 /* RTCPeerConnection.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCPeerConnection.idl; sourceTree = "<group>"; };
@@ -7554,8 +7554,8 @@
07969D9817D14151007FF842 /* JSRTCDTMFToneChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCDTMFToneChangeEvent.h; sourceTree = "<group>"; };
07969D9B17D14151007FF842 /* JSRTCIceCandidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCIceCandidate.cpp; sourceTree = "<group>"; };
07969D9C17D14151007FF842 /* JSRTCIceCandidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCIceCandidate.h; sourceTree = "<group>"; };
- 07969D9D17D14151007FF842 /* JSRTCIceCandidateEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCIceCandidateEvent.cpp; sourceTree = "<group>"; };
- 07969D9E17D14151007FF842 /* JSRTCIceCandidateEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCIceCandidateEvent.h; sourceTree = "<group>"; };
+ 07969D9D17D14151007FF842 /* JSRTCPeerConnectionIceEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCPeerConnectionIceEvent.cpp; sourceTree = "<group>"; };
+ 07969D9E17D14151007FF842 /* JSRTCPeerConnectionIceEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCPeerConnectionIceEvent.h; sourceTree = "<group>"; };
07969D9F17D14151007FF842 /* JSRTCPeerConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCPeerConnection.cpp; sourceTree = "<group>"; };
07969DA017D14151007FF842 /* JSRTCPeerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCPeerConnection.h; sourceTree = "<group>"; };
07969DA117D14151007FF842 /* JSRTCSessionDescription.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCSessionDescription.cpp; sourceTree = "<group>"; };
@@ -15928,9 +15928,9 @@
07221B7117CEC32700848E51 /* RTCIceCandidate.cpp */,
07221B7217CEC32700848E51 /* RTCIceCandidate.h */,
07221B7317CEC32700848E51 /* RTCIceCandidate.idl */,
- 07221B7417CEC32700848E51 /* RTCIceCandidateEvent.cpp */,
- 07221B7517CEC32700848E51 /* RTCIceCandidateEvent.h */,
- 07221B7617CEC32700848E51 /* RTCIceCandidateEvent.idl */,
+ 07221B7417CEC32700848E51 /* RTCPeerConnectionIceEvent.cpp */,
+ 07221B7517CEC32700848E51 /* RTCPeerConnectionIceEvent.h */,
+ 07221B7617CEC32700848E51 /* RTCPeerConnectionIceEvent.idl */,
316DCB3B1E790E2C001B5F87 /* RTCIceConnectionState.idl */,
316DCB351E790E1B001B5F87 /* RTCIceGatheringState.idl */,
07AB996718DA3C010018771E /* RTCIceServer.h */,
@@ -16164,8 +16164,8 @@
07969D9817D14151007FF842 /* JSRTCDTMFToneChangeEvent.h */,
07969D9B17D14151007FF842 /* JSRTCIceCandidate.cpp */,
07969D9C17D14151007FF842 /* JSRTCIceCandidate.h */,
- 07969D9D17D14151007FF842 /* JSRTCIceCandidateEvent.cpp */,
- 07969D9E17D14151007FF842 /* JSRTCIceCandidateEvent.h */,
+ 07969D9D17D14151007FF842 /* JSRTCPeerConnectionIceEvent.cpp */,
+ 07969D9E17D14151007FF842 /* JSRTCPeerConnectionIceEvent.h */,
316DCB451E7910A6001B5F87 /* JSRTCIceConnectionState.cpp */,
316DCB461E7910A6001B5F87 /* JSRTCIceConnectionState.h */,
316DCB471E7910A6001B5F87 /* JSRTCIceGatheringState.cpp */,
@@ -27835,7 +27835,7 @@
07969DB017D14151007FF842 /* JSRTCDTMFSender.h in Headers */,
07969DB217D14151007FF842 /* JSRTCDTMFToneChangeEvent.h in Headers */,
07969DB617D14151007FF842 /* JSRTCIceCandidate.h in Headers */,
- 07969DB817D14151007FF842 /* JSRTCIceCandidateEvent.h in Headers */,
+ 07969DB817D14151007FF842 /* JSRTCPeerConnectionIceEvent.h in Headers */,
073794EC19EE341E00E5A045 /* JSRTCIceServer.h in Headers */,
07969DBA17D14151007FF842 /* JSRTCPeerConnection.h in Headers */,
5E2C43721BCF0D750001E2BC /* JSRTCRtpReceiver.h in Headers */,
@@ -28883,7 +28883,7 @@
078E092117D14D1C00420AA1 /* RTCDTMFToneChangeEvent.h in Headers */,
078E092317D14D1C00420AA1 /* RTCIceCandidate.h in Headers */,
078E094017D16E1C00420AA1 /* RTCIceCandidateDescriptor.h in Headers */,
- 078E092417D14D1C00420AA1 /* RTCIceCandidateEvent.h in Headers */,
+ 078E092417D14D1C00420AA1 /* RTCPeerConnectionIceEvent.h in Headers */,
07AB996B18DA3C010018771E /* RTCIceServer.h in Headers */,
073794FE19F5864E00E5A045 /* RTCNotifiersMock.h in Headers */,
073794DE19EE2C5200E5A045 /* RTCOfferAnswerOptions.h in Headers */,
@@ -31798,7 +31798,7 @@
07969DAF17D14151007FF842 /* JSRTCDTMFSender.cpp in Sources */,
07969DB117D14151007FF842 /* JSRTCDTMFToneChangeEvent.cpp in Sources */,
07969DB517D14151007FF842 /* JSRTCIceCandidate.cpp in Sources */,
- 07969DB717D14151007FF842 /* JSRTCIceCandidateEvent.cpp in Sources */,
+ 07969DB717D14151007FF842 /* JSRTCPeerConnectionIceEvent.cpp in Sources */,
073794EB19EE341E00E5A045 /* JSRTCIceServer.cpp in Sources */,
07969DB917D14151007FF842 /* JSRTCPeerConnection.cpp in Sources */,
5E2C43711BCF0D750001E2BC /* JSRTCRtpReceiver.cpp in Sources */,
@@ -32718,7 +32718,7 @@
078E090817D14CEE00420AA1 /* RTCDTMFToneChangeEvent.cpp in Sources */,
078E090917D14CEE00420AA1 /* RTCIceCandidate.cpp in Sources */,
073BE34F17D18183002BD431 /* RTCIceCandidateDescriptor.cpp in Sources */,
- 078E090A17D14CEE00420AA1 /* RTCIceCandidateEvent.cpp in Sources */,
+ 078E090A17D14CEE00420AA1 /* RTCPeerConnectionIceEvent.cpp in Sources */,
073794FD19F5864E00E5A045 /* RTCNotifiersMock.cpp in Sources */,
078E090B17D14CEE00420AA1 /* RTCPeerConnection.cpp in Sources */,
5E2C43621BCEE32B0001E2BC /* RTCRtpReceiver.cpp in Sources */,
Modified: trunk/Source/WebCore/dom/EventNames.in (214329 => 214330)
--- trunk/Source/WebCore/dom/EventNames.in 2017-03-24 01:36:06 UTC (rev 214329)
+++ trunk/Source/WebCore/dom/EventNames.in 2017-03-24 01:40:50 UTC (rev 214330)
@@ -43,7 +43,7 @@
OfflineAudioCompletionEvent conditional=WEB_AUDIO
MediaStreamEvent conditional=WEB_RTC
MediaStreamTrackEvent conditional=MEDIA_STREAM
-RTCIceCandidateEvent conditional=WEB_RTC
+RTCPeerConnectionIceEvent conditional=WEB_RTC
RTCDataChannelEvent conditional=WEB_RTC
RTCDTMFToneChangeEvent conditional=WEB_RTC
RTCTrackEvent conditional=WEB_RTC
