Changeset 213108 in webkit

Timestamp:

Feb 27, 2017 5:34:35 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[WebRTC] Support modern RTCStatsReport
​https://bugs.webkit.org/show_bug.cgi?id=166916
<rdar://problem/30293780>

Patch by Youenn Fablet <​youenn@apple.com> on 2017-02-27
Reviewed by Alex Christensen.

Updating binding generator and IDL parser to handle maplike.
Covered by binding tests.

Added support for maplike binding from JS wrapper to DOM class.
The principle is to have the JSXX wrapper having a @backingMap slot containing a Map.
All maplike methods are forwarded to the corresponding Map methods.
The XX object is responsible to add key/value pairs using a helper routine.
The creation of the Map is done at creation of the JSXX wrapper.

DOM class is interacting with the map through DOMMapLike.
Extracted DOMGuarded from DOM promise implementation.
This allows reusing this code for DOMMapLike.

Covered by binding tests and manual tests.

• CMakeLists.txt:
• DerivedSources.make:
• Modules/mediastream/RTCStatsReport.h:

(WebCore::RTCStatsReport::InboundRTPStreamStats::InboundRTPStreamStats):
(WebCore::RTCStatsReport::OutboundRTPStreamStats::OutboundRTPStreamStats):
(WebCore::RTCStatsReport::create):
(WebCore::RTCStatsReport::synchronizeBackingMap):
(WebCore::RTCStatsReport::backingMap):
(WebCore::RTCStatsReport::addStats):

• Modules/mediastream/RTCStatsReport.idl:
• Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:

(WebCore::fromStdString):
(WebCore::fillRTCStats):
(WebCore::fillRTCRTPStreamStats):
(WebCore::fillInboundRTPStreamStats):
(WebCore::fillOutboundRTPStreamStats):
(WebCore::LibWebRTCMediaEndpoint::StatsCollector::OnStatsDelivered):

• Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.h:
• WebCore.xcodeproj/project.pbxproj:
• bindings/js/JSDOMBindingInternals.js: Added.

(mapLikeForEach):

• bindings/js/JSDOMGlobalObject.cpp:

(WebCore::JSDOMGlobalObject::visitChildren):

• bindings/js/JSDOMGlobalObject.h:
• bindings/js/JSDOMGuardedObject.cpp: Added.

(WebCore::DOMGuardedObject::DOMGuardedObject):
(WebCore::DOMGuardedObject::~DOMGuardedObject):
(WebCore::DOMGuardedObject::clear):
(WebCore::DOMGuardedObject::contextDestroyed):

• bindings/js/JSDOMGuardedObject.h: Added.

(WebCore::DOMGuardedObject::isSuspended):
(WebCore::DOMGuardedObject::visitAggregate):
(WebCore::DOMGuardedObject::guardedObject):
(WebCore::DOMGuardedObject::globalObject):
(WebCore::DOMGuardedObject::isEmpty):
(WebCore::DOMGuarded::DOMGuarded):
(WebCore::DOMGuarded::guarded):

• bindings/js/JSDOMMapLike.cpp: Added.

(WebCore::getBackingMap):
(WebCore::initializeBackingMap):
(WebCore::createBackingMap):
(WebCore::forwardAttributeGetterToBackingMap):
(WebCore::forwardFunctionCallToBackingMap):
(WebCore::forwardForEachCallToBackingMap):

• bindings/js/JSDOMMapLike.h: Added.

(WebCore::DOMMapLike::set):
(WebCore::synchronizeBackingMap):
(WebCore::forwardSizeToMapLike):
(WebCore::forwardEntriesToMapLike):
(WebCore::forwardKeysToMapLike):
(WebCore::forwardValuesToMapLike):
(WebCore::forwardClearToMapLike):
(WebCore::forwardForEachToMapLike):
(WebCore::forwardHasToMapLike):
(WebCore::forwardAddToMapLike):
(WebCore::forwardDeleteToMapLike):

• bindings/js/JSDOMPromise.cpp:

(WebCore::DeferredPromise::promise):
(WebCore::DeferredPromise::reject):

• bindings/js/JSDOMPromise.h:

(WebCore::DeferredPromise::resolve):
(WebCore::DeferredPromise::resolveWithNewlyCreated):
(WebCore::DeferredPromise::reject):
(WebCore::DeferredPromise::resolveWithCallback):
(WebCore::DeferredPromise::rejectWithCallback):
(WebCore::DeferredPromise::DeferredPromise):
(WebCore::DeferredPromise::deferred):

• bindings/js/WebCoreBuiltinNames.h:
• bindings/scripts/CodeGeneratorJS.pm:

(PrototypeFunctionCount):
(GeneratePropertiesHashTable):
(InterfaceNeedsIterator):
(GenerateImplementation):
(GenerateParametersCheck):

• bindings/scripts/IDLParser.pm:

(assert):
(parseAttributeOrOperationOrIterator):
(parseSerializer):
(parseAttributeOrOperationRest):
(parseAttribute):
(parseAttributeRest):
(parseOperationOrIterator):
(parseOptionalIterableInterface):
(parseMapLikeRest):
(parseMapLikeProperties):
(parseOperationRest):
(applyMemberList):

• bindings/scripts/test/JS/JSMapLike.cpp: Added.
• bindings/scripts/test/JS/JSMapLike.h: Added.
• bindings/scripts/test/JS/JSReadOnlyMapLike.cpp: Added.
• bindings/scripts/test/JS/JSReadOnlyMapLike.h: Added.
• bindings/scripts/test/TestMapLike.idl: Added.
• bindings/scripts/test/TestReadOnlyMapLike.idl: Added.

Location:

trunk/Source

Files:

• ThirdParty/libwebrtc/Source/webrtc/api/stats/rtcstats_objects.h (modified) (3 diffs)
• ThirdParty/libwebrtc/Source/webrtc/api/stats/rtcstatsreport.h (modified) (2 diffs)
• WebCore/CMakeLists.txt (modified) (3 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/DerivedSources.make (modified) (1 diff)
• WebCore/Modules/mediastream/RTCStatsReport.cpp (deleted)
• WebCore/Modules/mediastream/RTCStatsReport.h (modified) (3 diffs)
• WebCore/Modules/mediastream/RTCStatsReport.idl (modified) (1 diff)
• WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp (modified) (3 diffs)
• WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.h (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (19 diffs)
• WebCore/bindings/js/JSDOMBindingInternals.js (added)
• WebCore/bindings/js/JSDOMGlobalObject.cpp (modified) (1 diff)
• WebCore/bindings/js/JSDOMGlobalObject.h (modified) (4 diffs)
• WebCore/bindings/js/JSDOMGuardedObject.cpp (added)
• WebCore/bindings/js/JSDOMGuardedObject.h (added)
• WebCore/bindings/js/JSDOMMapLike.cpp (added)
• WebCore/bindings/js/JSDOMMapLike.h (added)
• WebCore/bindings/js/JSDOMPromise.cpp (modified) (6 diffs)
• WebCore/bindings/js/JSDOMPromise.h (modified) (6 diffs)
• WebCore/bindings/js/WebCoreBuiltinNames.h (modified) (1 diff)
• WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (18 diffs)
• WebCore/bindings/scripts/IDLParser.pm (modified) (20 diffs)
• WebCore/bindings/scripts/test/JS/JSMapLike.cpp (added)
• WebCore/bindings/scripts/test/JS/JSMapLike.h (added)
• WebCore/bindings/scripts/test/JS/JSReadOnlyMapLike.cpp (added)
• WebCore/bindings/scripts/test/JS/JSReadOnlyMapLike.h (added)
• WebCore/bindings/scripts/test/TestMapLike.idl (added)
• WebCore/bindings/scripts/test/TestReadOnlyMapLike.idl (added)

trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/stats/rtcstats_objects.h

@@ -15 +15 @@
 
 #include "webrtc/api/stats/rtcstats.h"
+#include "webrtc/base/export.h"
 
 namespace webrtc {
@@ -302 +303 @@
 // TODO(hbos): Finish implementation and support the remote case
 // |is_remote = true|. Tracking bug crbug.com/657855
-class RTCInboundRTPStreamStats final : public RTCRTPStreamStats {
+class WEBRTC_EXPORT RTCInboundRTPStreamStats final : public RTCRTPStreamStats {
  public:
   WEBRTC_RTCSTATS_DECL();
@@ -344 +345 @@
 // TODO(hbos): Finish implementation and support the remote case
 // |is_remote = true|. Tracking bug crbug.com/657856
-class RTCOutboundRTPStreamStats final : public RTCRTPStreamStats {
+class WEBRTC_EXPORT RTCOutboundRTPStreamStats final : public RTCRTPStreamStats {
  public:
   WEBRTC_RTCSTATS_DECL();

trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/stats/rtcstatsreport.h

@@ -18 +18 @@
 
 #include "webrtc/api/stats/rtcstats.h"
+#include "webrtc/base/export.h"
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
@@ -25 +26 @@
 // A collection of stats.
 // This is accessible as a map from |RTCStats::id| to |RTCStats|.
-class RTCStatsReport : public rtc::RefCountInterface {
+class WEBRTC_EXPORT RTCStatsReport : public rtc::RefCountInterface {
  public:
   typedef std::map<std::string, std::unique_ptr<const RTCStats>> StatsMap;

trunk/Source/WebCore/CMakeLists.txt

@@ -936 +936 @@
     Modules/mediastream/RTCRtpTransceiver.cpp
     Modules/mediastream/RTCSessionDescription.cpp
-    Modules/mediastream/RTCStatsReport.cpp
     Modules/mediastream/RTCTrackEvent.cpp
     Modules/mediastream/SDPProcessor.cpp
@@ -1122 +1121 @@
     bindings/js/JSDOMGlobalObject.cpp
     bindings/js/JSDOMGlobalObjectTask.cpp
+    bindings/js/JSDOMGuardedObject.cpp
+    bindings/js/JSDOMMapLike.cpp
     bindings/js/JSDOMPromise.cpp
     bindings/js/JSDOMStringMapCustom.cpp
@@ -3701 +3702 @@
     ${WEBCORE_DIR}/Modules/streams/WritableStream.js
     ${WEBCORE_DIR}/Modules/streams/WritableStreamInternals.js
+    ${WEBCORE_DIR}/bindings/js/JSDOMBindingInternals.js
     ${WEBCORE_DIR}/xml/XMLHttpRequest.js
 )

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-27  Youenn Fablet  <youenn@apple.com>
+
+        [WebRTC] Support modern RTCStatsReport
+        https://bugs.webkit.org/show_bug.cgi?id=166916
+        <rdar://problem/30293780>
+
+        Reviewed by Alex Christensen.
+
+        Updating binding generator and IDL parser to handle maplike.
+        Covered by binding tests.
+
+        Added support for maplike binding from JS wrapper to DOM class.
+        The principle is to have the JSXX wrapper having a @backingMap slot containing a Map.
+        All maplike methods are forwarded to the corresponding Map methods.
+        The XX object is responsible to add key/value pairs using a helper routine.
+        The creation of the Map is done at creation of the JSXX wrapper.
+
+        DOM class is interacting with the map through DOMMapLike.
+        Extracted DOMGuarded from DOM promise implementation.
+        This allows reusing this code for DOMMapLike.
+
+        Covered by binding tests and manual tests.
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * Modules/mediastream/RTCStatsReport.h:
+        (WebCore::RTCStatsReport::InboundRTPStreamStats::InboundRTPStreamStats):
+        (WebCore::RTCStatsReport::OutboundRTPStreamStats::OutboundRTPStreamStats):
+        (WebCore::RTCStatsReport::create):
+        (WebCore::RTCStatsReport::synchronizeBackingMap):
+        (WebCore::RTCStatsReport::backingMap):
+        (WebCore::RTCStatsReport::addStats):
+        * Modules/mediastream/RTCStatsReport.idl:
+        * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
+        (WebCore::fromStdString):
+        (WebCore::fillRTCStats):
+        (WebCore::fillRTCRTPStreamStats):
+        (WebCore::fillInboundRTPStreamStats):
+        (WebCore::fillOutboundRTPStreamStats):
+        (WebCore::LibWebRTCMediaEndpoint::StatsCollector::OnStatsDelivered):
+        * Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.h:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSDOMBindingInternals.js: Added.
+        (mapLikeForEach):
+        * bindings/js/JSDOMGlobalObject.cpp:
+        (WebCore::JSDOMGlobalObject::visitChildren):
+        * bindings/js/JSDOMGlobalObject.h:
+        * bindings/js/JSDOMGuardedObject.cpp: Added.
+        (WebCore::DOMGuardedObject::DOMGuardedObject):
+        (WebCore::DOMGuardedObject::~DOMGuardedObject):
+        (WebCore::DOMGuardedObject::clear):
+        (WebCore::DOMGuardedObject::contextDestroyed):
+        * bindings/js/JSDOMGuardedObject.h: Added.
+        (WebCore::DOMGuardedObject::isSuspended):
+        (WebCore::DOMGuardedObject::visitAggregate):
+        (WebCore::DOMGuardedObject::guardedObject):
+        (WebCore::DOMGuardedObject::globalObject):
+        (WebCore::DOMGuardedObject::isEmpty):
+        (WebCore::DOMGuarded::DOMGuarded):
+        (WebCore::DOMGuarded::guarded):
+        * bindings/js/JSDOMMapLike.cpp: Added.
+        (WebCore::getBackingMap):
+        (WebCore::initializeBackingMap):
+        (WebCore::createBackingMap):
+        (WebCore::forwardAttributeGetterToBackingMap):
+        (WebCore::forwardFunctionCallToBackingMap):
+        (WebCore::forwardForEachCallToBackingMap):
+        * bindings/js/JSDOMMapLike.h: Added.
+        (WebCore::DOMMapLike::set):
+        (WebCore::synchronizeBackingMap):
+        (WebCore::forwardSizeToMapLike):
+        (WebCore::forwardEntriesToMapLike):
+        (WebCore::forwardKeysToMapLike):
+        (WebCore::forwardValuesToMapLike):
+        (WebCore::forwardClearToMapLike):
+        (WebCore::forwardForEachToMapLike):
+        (WebCore::forwardHasToMapLike):
+        (WebCore::forwardAddToMapLike):
+        (WebCore::forwardDeleteToMapLike):
+        * bindings/js/JSDOMPromise.cpp:
+        (WebCore::DeferredPromise::promise):
+        (WebCore::DeferredPromise::reject):
+        * bindings/js/JSDOMPromise.h:
+        (WebCore::DeferredPromise::resolve):
+        (WebCore::DeferredPromise::resolveWithNewlyCreated):
+        (WebCore::DeferredPromise::reject):
+        (WebCore::DeferredPromise::resolveWithCallback):
+        (WebCore::DeferredPromise::rejectWithCallback):
+        (WebCore::DeferredPromise::DeferredPromise):
+        (WebCore::DeferredPromise::deferred):
+        * bindings/js/WebCoreBuiltinNames.h:
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (PrototypeFunctionCount):
+        (GeneratePropertiesHashTable):
+        (InterfaceNeedsIterator):
+        (GenerateImplementation):
+        (GenerateParametersCheck):
+        * bindings/scripts/IDLParser.pm:
+        (assert):
+        (parseAttributeOrOperationOrIterator):
+        (parseSerializer):
+        (parseAttributeOrOperationRest):
+        (parseAttribute):
+        (parseAttributeRest):
+        (parseOperationOrIterator):
+        (parseOptionalIterableInterface):
+        (parseMapLikeRest):
+        (parseMapLikeProperties):
+        (parseOperationRest):
+        (applyMemberList):
+        * bindings/scripts/test/JS/JSMapLike.cpp: Added.
+        * bindings/scripts/test/JS/JSMapLike.h: Added.
+        * bindings/scripts/test/JS/JSReadOnlyMapLike.cpp: Added.
+        * bindings/scripts/test/JS/JSReadOnlyMapLike.h: Added.
+        * bindings/scripts/test/TestMapLike.idl: Added.
+        * bindings/scripts/test/TestReadOnlyMapLike.idl: Added.
+
 2017-02-27  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WebCore/DerivedSources.make

@@ -1364 +1364 @@
     $(WebCore)/Modules/streams/WritableStream.js \
     $(WebCore)/Modules/streams/WritableStreamInternals.js \
+    $(WebCore)/bindings/js/JSDOMBindingInternals.js \
     $(WebCore)/xml/XMLHttpRequest.js \
 #

trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.h

@@ -1 +1 @@
 /*
  * 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
@@ -25 +26 @@
 #pragma once
 
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
+#include "JSDOMMapLike.h"
 
 namespace WebCore {
@@ -34 +34 @@
     static Ref<RTCStatsReport> create() { return adoptRef(*new RTCStatsReport); }
 
+    void synchronizeBackingMap(Ref<DOMMapLike>&& mapLike) { m_mapLike = WTFMove(mapLike); }
+    DOMMapLike* backingMap() { return m_mapLike.get(); }
+
+    template<typename Value> void addStats(typename Value::ParameterType&& value) { m_mapLike->set<IDLDOMString, Value>(value.id, std::forward<typename Value::ParameterType>(value)); }
+
+
+    enum class Type {
+        Codec,
+        InboundRtp,
+        OutboundRtp,
+        PeerConnection,
+        DataChannel,
+        Track,
+        Transport,
+        CandidatePair,
+        LocalCandidate,
+        RemoteCandidate,
+        Certificate
+    };
+    struct Stats {
+        unsigned long long timestamp;
+        Type type;
+        String id;
+    };
+
+    struct RTCRTPStreamStats : Stats {
+        String ssrc;
+        String associateStatsId;
+        bool isRemote { false };
+        String mediaType;
+
+        String mediaTrackId;
+        String transportId;
+        String codecId;
+        unsigned long firCount { 0 };
+        unsigned long pliCount { 0 };
+        unsigned long nackCount { 0 };
+        unsigned long sliCount { 0 };
+        unsigned long long qpSum { 0 };
+    };
+
+    struct InboundRTPStreamStats : RTCRTPStreamStats {
+        InboundRTPStreamStats() { type = RTCStatsReport::Type::InboundRtp; }
+
+        String ssrc;
+        String associateStatsId;
+        bool isRemote { false };
+        String mediaType;
+        String mediaTrackId;
+        String transportId;
+        String codecId;
+        unsigned long firCount { 0 };
+        unsigned long pliCount { 0 };
+        unsigned long nackCount { 0 };
+        unsigned long sliCount { 0 };
+        unsigned long long qpSum { 0 };
+        unsigned long packetsReceived { 0 };
+        unsigned long long bytesReceived { 0 };
+        unsigned long packetsLost { 0 };
+        double jitter { 0 };
+        double fractionLost { 0 };
+        unsigned long packetsDiscarded { 0 };
+        unsigned long packetsRepaired { 0 };
+        unsigned long burstPacketsLost { 0 };
+        unsigned long burstPacketsDiscarded { 0 };
+        unsigned long burstLossCount { 0 };
+        unsigned long burstDiscardCount { 0 };
+        double burstLossRate { 0 };
+        double burstDiscardRate { 0 };
+        double gapLossRate { 0 };
+        double gapDiscardRate { 0 };
+        unsigned long framesDecoded { 0 };
+    };
+
+    struct OutboundRTPStreamStats : RTCRTPStreamStats {
+        OutboundRTPStreamStats() { type = RTCStatsReport::Type::OutboundRtp; }
+
+        unsigned long packetsSent { 0 };
+        unsigned long long bytesSent { 0 };
+        double targetBitrate { 0 };
+        double roundTripTime { 0 };
+        unsigned long framesEncoded { 0 };
+    };
+
 private:
     RTCStatsReport() = default;
+
+private:
+    RefPtr<DOMMapLike> m_mapLike;
 };
 

trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.idl

@@ -28 +28 @@
     ImplementationLacksVTable,
 ] interface RTCStatsReport {
-    // FIXME: Make it setlike
-    //readonly maplike<DOMString, object>;
+    readonly maplike<DOMString, object>;
 };
+
+enum RTCStatsType {
+    "codec",
+    "inbound-rtp",
+    "outbound-rtp",
+    "peer-connection",
+    "data-channel",
+    "track",
+    "transport",
+    "candidate-pair",
+    "local-candidate",
+    "remote-candidate",
+    "certificate"
+};
+
+dictionary RTCStats {
+    unsigned long long timestamp;
+    RTCStatsType type;
+    DOMString id;
+
+};
+
+dictionary RTCRTPStreamStats : RTCStats {
+    DOMString ssrc;
+    DOMString associateStatsId;
+    boolean isRemote = false;
+    DOMString mediaType;
+    DOMString mediaTrackId;
+    DOMString transportId;
+    DOMString codecId;
+    unsigned long firCount;
+    unsigned long pliCount;
+    unsigned long nackCount;
+    unsigned long sliCount;
+    unsigned long long qpSum;
+};
+
+[ JSGenerateToJSObject ]
+dictionary RTCInboundRTPStreamStats : RTCRTPStreamStats {
+    unsigned long packetsReceived;
+    unsigned long long bytesReceived;
+    unsigned long packetsLost;
+    double jitter;
+    double fractionLost;
+    unsigned long packetsDiscarded;
+    unsigned long packetsRepaired;
+    unsigned long burstPacketsLost;
+    unsigned long burstPacketsDiscarded;
+    unsigned long burstLossCount;
+    unsigned long burstDiscardCount;
+    double burstLossRate;
+    double burstDiscardRate;
+    double gapLossRate;
+    double gapDiscardRate;
+    unsigned long framesDecoded;
+};
+
+[ JSGenerateToJSObject ]
+dictionary RTCOutboundRTPStreamStats : RTCRTPStreamStats {
+    unsigned long packetsSent;
+    unsigned long long bytesSent;
+    double targetBitrate;
+    double roundTripTime;
+    unsigned long framesEncoded;
+};

trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp

@@ -29 +29 @@
 
 #include "EventNames.h"
+#include "JSDOMConvert.h"
+#include "JSRTCStatsReport.h"
 #include "LibWebRTCDataChannelHandler.h"
 #include "LibWebRTCPeerConnectionBackend.h"
@@ -39 +41 @@
 #include "RTCPeerConnection.h"
 #include "RTCSessionDescription.h"
+#include "RTCStatsReport.h"
 #include "RTCTrackEvent.h"
 #include "RealtimeIncomingAudioSource.h"
@@ -227 +230 @@
 }
 
-void LibWebRTCMediaEndpoint::StatsCollector::OnStatsDelivered(const rtc::scoped_refptr<const webrtc::RTCStatsReport>& report)
-{
-    callOnMainThread([protectedThis = rtc::scoped_refptr<LibWebRTCMediaEndpoint::StatsCollector>(this), report] {
+static inline String fromStdString(const std::string& value)
+{
+    return String(value.data(), value.length());
+}
+
+static inline void fillRTCStats(RTCStatsReport::Stats& stats, const webrtc::RTCStats& rtcStats)
+{
+    stats.timestamp = rtcStats.timestamp_us();
+    stats.id = fromStdString(rtcStats.id());
+}
+
+static inline void fillRTCRTPStreamStats(RTCStatsReport::RTCRTPStreamStats& stats, const webrtc::RTCRTPStreamStats& rtcStats)
+{
+    fillRTCStats(stats, rtcStats);
+    if (rtcStats.ssrc.is_defined())
+        stats.ssrc = fromStdString(*rtcStats.ssrc);
+    if (rtcStats.associate_stats_id.is_defined())
+        stats.associateStatsId = fromStdString(*rtcStats.associate_stats_id);
+    if (rtcStats.is_remote.is_defined())
+        stats.isRemote = *rtcStats.is_remote;
+    if (rtcStats.media_type.is_defined())
+        stats.mediaType = fromStdString(*rtcStats.media_type);
+    if (rtcStats.media_track_id.is_defined())
+        stats.mediaTrackId = fromStdString(*rtcStats.media_track_id);
+    if (rtcStats.transport_id.is_defined())
+        stats.transportId = fromStdString(*rtcStats.transport_id);
+    if (rtcStats.codec_id.is_defined())
+        stats.codecId = fromStdString(*rtcStats.codec_id);
+    if (rtcStats.fir_count.is_defined())
+        stats.firCount = *rtcStats.fir_count;
+    if (rtcStats.pli_count.is_defined())
+        stats.pliCount = *rtcStats.pli_count;
+    if (rtcStats.nack_count.is_defined())
+        stats.nackCount = *rtcStats.nack_count;
+    if (rtcStats.sli_count.is_defined())
+        stats.sliCount = *rtcStats.sli_count;
+    // FIXME: Set qpSum
+    stats.qpSum = 0;
+}
+
+static inline void fillInboundRTPStreamStats(RTCStatsReport::InboundRTPStreamStats& stats, const webrtc::RTCInboundRTPStreamStats& rtcStats)
+{
+    fillRTCRTPStreamStats(stats, rtcStats);
+    if (rtcStats.packets_received.is_defined())
+        stats.packetsReceived = *rtcStats.packets_received;
+    if (rtcStats.bytes_received.is_defined())
+        stats.bytesReceived = *rtcStats.bytes_received;
+    if (rtcStats.packets_lost.is_defined())
+        stats.packetsLost = *rtcStats.packets_lost;
+    if (rtcStats.jitter.is_defined())
+        stats.jitter = *rtcStats.jitter;
+    if (rtcStats.fraction_lost.is_defined())
+        stats.fractionLost = *rtcStats.fraction_lost;
+    if (rtcStats.packets_discarded.is_defined())
+        stats.packetsDiscarded = *rtcStats.packets_discarded;
+    if (rtcStats.packets_repaired.is_defined())
+        stats.packetsRepaired = *rtcStats.packets_repaired;
+    if (rtcStats.burst_packets_lost.is_defined())
+        stats.burstPacketsLost = *rtcStats.burst_packets_lost;
+    if (rtcStats.burst_packets_discarded.is_defined())
+        stats.burstPacketsDiscarded = *rtcStats.burst_packets_discarded;
+    if (rtcStats.burst_loss_count.is_defined())
+        stats.burstLossCount = *rtcStats.burst_loss_count;
+    if (rtcStats.burst_discard_count.is_defined())
+        stats.burstDiscardCount = *rtcStats.burst_discard_count;
+    if (rtcStats.burst_loss_rate.is_defined())
+        stats.burstLossRate = *rtcStats.burst_loss_rate;
+    if (rtcStats.burst_discard_rate.is_defined())
+        stats.burstDiscardRate = *rtcStats.burst_discard_rate;
+    if (rtcStats.gap_loss_rate.is_defined())
+        stats.gapLossRate = *rtcStats.gap_loss_rate;
+    if (rtcStats.gap_discard_rate.is_defined())
+        stats.gapDiscardRate = *rtcStats.gap_discard_rate;
+    // FIXME: Set framesDecoded
+    stats.framesDecoded = 0;
+}
+
+static inline void fillOutboundRTPStreamStats(RTCStatsReport::OutboundRTPStreamStats& stats, const webrtc::RTCOutboundRTPStreamStats& rtcStats)
+{
+    fillRTCRTPStreamStats(stats, rtcStats);
+
+    if (rtcStats.packets_sent.is_defined())
+        stats.packetsSent = *rtcStats.packets_sent;
+    if (rtcStats.bytes_sent.is_defined())
+        stats.bytesSent = *rtcStats.bytes_sent;
+    if (rtcStats.target_bitrate.is_defined())
+        stats.targetBitrate = *rtcStats.target_bitrate;
+    if (rtcStats.round_trip_time.is_defined())
+        stats.roundTripTime = *rtcStats.round_trip_time;
+    // FIXME: Set framesEncoded
+    stats.framesEncoded = 0;
+}
+
+void LibWebRTCMediaEndpoint::StatsCollector::OnStatsDelivered(const rtc::scoped_refptr<const webrtc::RTCStatsReport>& rtcReport)
+{
+    callOnMainThread([protectedThis = rtc::scoped_refptr<LibWebRTCMediaEndpoint::StatsCollector>(this), rtcReport] {
         if (protectedThis->m_endpoint->isStopped())
             return;
 
-        // FIXME: Fulfill promise with the report
-        UNUSED_PARAM(report);
-
-        protectedThis->m_endpoint->m_peerConnectionBackend.getStatsFailed(protectedThis->m_promise, Exception { TypeError, ASCIILiteral("Stats API is not yet implemented") });
+        auto report = RTCStatsReport::create();
+        protectedThis->m_endpoint->m_peerConnectionBackend.getStatsSucceeded(protectedThis->m_promise, report.copyRef());
+        ASSERT(report->backingMap());
+
+        for (const auto& rtcStats : *rtcReport) {
+            if (rtcStats.type() == webrtc::RTCInboundRTPStreamStats::kType) {
+                RTCStatsReport::InboundRTPStreamStats stats;
+                fillInboundRTPStreamStats(stats, static_cast<const webrtc::RTCInboundRTPStreamStats&>(rtcStats));
+                report->addStats<IDLDictionary<RTCStatsReport::InboundRTPStreamStats>>(WTFMove(stats));
+                return;
+            }
+            if (rtcStats.type() == webrtc::RTCOutboundRTPStreamStats::kType) {
+                RTCStatsReport::OutboundRTPStreamStats stats;
+                fillOutboundRTPStreamStats(stats, static_cast<const webrtc::RTCOutboundRTPStreamStats&>(rtcStats));
+                report->addStats<IDLDictionary<RTCStatsReport::OutboundRTPStreamStats>>(WTFMove(stats));
+                return;
+            }
+        }
     });
 }

trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.h

@@ -39 +39 @@
 class RTCRtpReceiver;
 class RTCSessionDescription;
-class RTCstatsReport;
+class RTCStatsReport;
 class RealtimeOutgoingAudioSource;
 class RealtimeOutgoingVideoSource;

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -193 +193 @@
                 078E090B17D14CEE00420AA1 /* RTCPeerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B7717CEC32700848E51 /* RTCPeerConnection.cpp */; };
                 078E090C17D14CEE00420AA1 /* RTCSessionDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B7A17CEC32700848E51 /* RTCSessionDescription.cpp */; };
-                078E090E17D14CEE00420AA1 /* RTCStatsReport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B8317CEC32700848E51 /* RTCStatsReport.cpp */; };
                 078E091217D14CEE00420AA1 /* UserMediaController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B8E17CEC32700848E51 /* UserMediaController.cpp */; };
                 078E091317D14CEE00420AA1 /* UserMediaRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B9017CEC32700848E51 /* UserMediaRequest.cpp */; };
@@ -1567 +1566 @@
                 416E29A6102FA962007FC14E /* WorkerReportingProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 416E29A5102FA962007FC14E /* WorkerReportingProxy.h */; };
                 416E6FE81BBD12DF000A3F64 /* ReadableStreamInternalsBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                416E6FE81BBD12DF000A3F65 /* JSDOMBindingInternalsBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8061BB3110D00B764DA /* JSDOMBindingInternalsBuiltins.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 416E6FE81BBD12DF000A6023 /* FetchInternalsBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8061BB3110D00B764B9 /* FetchInternalsBuiltins.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 416E6FE81BBD12DF000A6033 /* StreamInternalsBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8061BB3110D00B764C9 /* StreamInternalsBuiltins.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1602 +1602 @@
                 419BE7591BC7F42B00E1C85B /* WebCoreBuiltinNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 419BE7521BC7F3DB00E1C85B /* WebCoreBuiltinNames.h */; };
                 41A1B00E1E526579007F3769 /* LibWebRTCProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41A1B00D1E52656E007F3769 /* LibWebRTCProvider.cpp */; };
+                41A1B01C1E54239B007F3769 /* JSDOMGuardedObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 41A1B01A1E542396007F3769 /* JSDOMGuardedObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                41A1B01D1E54239E007F3769 /* JSDOMGuardedObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41A1B01B1E542396007F3769 /* JSDOMGuardedObject.cpp */; };
                 41A3D58E101C152D00316D07 /* DedicatedWorkerThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41A3D58C101C152D00316D07 /* DedicatedWorkerThread.cpp */; };
                 41A3D58F101C152D00316D07 /* DedicatedWorkerThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 41A3D58D101C152D00316D07 /* DedicatedWorkerThread.h */; };
@@ -1614 +1616 @@
                 41D015CA0F4B5C71004A662F /* ContentType.h in Headers */ = {isa = PBXBuildFile; fileRef = 41D015C80F4B5C71004A662F /* ContentType.h */; };
                 41D015CB0F4B5C71004A662F /* ContentType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41D015C90F4B5C71004A662F /* ContentType.cpp */; };
+                41DEFCB51E56C1BD000D9E5F /* JSDOMMapLike.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41DEFCB31E56C1B9000D9E5F /* JSDOMMapLike.cpp */; };
+                41DEFCB61E56C1BD000D9E5F /* JSDOMMapLike.h in Headers */ = {isa = PBXBuildFile; fileRef = 41DEFCB41E56C1B9000D9E5F /* JSDOMMapLike.h */; };
                 41E1B1D00FF5986900576B3B /* AbstractWorker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41E1B1CA0FF5986900576B3B /* AbstractWorker.cpp */; };
                 41E1B1D10FF5986900576B3B /* AbstractWorker.h in Headers */ = {isa = PBXBuildFile; fileRef = 41E1B1CB0FF5986900576B3B /* AbstractWorker.h */; };
@@ -7243 +7247 @@
                 07221B7B17CEC32700848E51 /* RTCSessionDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCSessionDescription.h; sourceTree = "<group>"; };
                 07221B7C17CEC32700848E51 /* RTCSessionDescription.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCSessionDescription.idl; sourceTree = "<group>"; };
-                07221B8317CEC32700848E51 /* RTCStatsReport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCStatsReport.cpp; sourceTree = "<group>"; };
                 07221B8417CEC32700848E51 /* RTCStatsReport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCStatsReport.h; sourceTree = "<group>"; };
                 07221B8517CEC32700848E51 /* RTCStatsReport.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCStatsReport.idl; sourceTree = "<group>"; };
@@ -8902 +8905 @@
                 41A023ED1A39DB7900F722DF /* WritableStream.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WritableStream.idl; sourceTree = "<group>"; };
                 41A1B00D1E52656E007F3769 /* LibWebRTCProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LibWebRTCProvider.cpp; path = libwebrtc/LibWebRTCProvider.cpp; sourceTree = "<group>"; };
+                41A1B01A1E542396007F3769 /* JSDOMGuardedObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMGuardedObject.h; sourceTree = "<group>"; };
+                41A1B01B1E542396007F3769 /* JSDOMGuardedObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMGuardedObject.cpp; sourceTree = "<group>"; };
                 41A3D58C101C152D00316D07 /* DedicatedWorkerThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DedicatedWorkerThread.cpp; sourceTree = "<group>"; };
                 41A3D58D101C152D00316D07 /* DedicatedWorkerThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DedicatedWorkerThread.h; sourceTree = "<group>"; };
@@ -8917 +8922 @@
                 41D015C90F4B5C71004A662F /* ContentType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentType.cpp; sourceTree = "<group>"; };
                 41D51BB21E4E2E8100131A5B /* LibWebRTCAudioFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LibWebRTCAudioFormat.h; path = libwebrtc/LibWebRTCAudioFormat.h; sourceTree = "<group>"; };
+                41DEFCB21E56C1B9000D9E5F /* JSDOMBindingInternals.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = JSDOMBindingInternals.js; sourceTree = "<group>"; };
+                41DEFCB31E56C1B9000D9E5F /* JSDOMMapLike.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMMapLike.cpp; sourceTree = "<group>"; };
+                41DEFCB41E56C1B9000D9E5F /* JSDOMMapLike.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMMapLike.h; sourceTree = "<group>"; };
                 41E1B1CA0FF5986900576B3B /* AbstractWorker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AbstractWorker.cpp; sourceTree = "<group>"; };
                 41E1B1CB0FF5986900576B3B /* AbstractWorker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AbstractWorker.h; sourceTree = "<group>"; };
@@ -11703 +11711 @@
                 9908B0FD1BCAD07D00ED0F55 /* StreamInternalsBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StreamInternalsBuiltins.cpp; sourceTree = "<group>"; };
                 9908B0FD1BCAD07D00ED0F65 /* ReadableStreamInternalsBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReadableStreamInternalsBuiltins.cpp; sourceTree = "<group>"; };
+                9908B0FD1BCAD07D00ED0F66 /* JSDOMBindingInternalsBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMBindingInternalsBuiltins.cpp; sourceTree = "<group>"; };
                 9908B0FD1BCAD07D00ED0F75 /* WritableStreamInternalsBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WritableStreamInternalsBuiltins.cpp; sourceTree = "<group>"; };
                 9908B0FD1BCAD07D00ED3F64 /* ReadableByteStreamInternalsBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReadableByteStreamInternalsBuiltins.cpp; sourceTree = "<group>"; };
@@ -11750 +11759 @@
                 9B03D8061BB3110D00B764D8 /* ReadableStreamBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamBuiltins.h; sourceTree = "<group>"; };
                 9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamInternalsBuiltins.h; sourceTree = "<group>"; };
+                9B03D8061BB3110D00B764DA /* JSDOMBindingInternalsBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMBindingInternalsBuiltins.h; sourceTree = "<group>"; };
                 9B03D8061BB3110D00B764E8 /* WritableStreamBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WritableStreamBuiltins.h; sourceTree = "<group>"; };
                 9B03D8061BB3110D00B764E9 /* WritableStreamInternalsBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WritableStreamInternalsBuiltins.h; sourceTree = "<group>"; };
@@ -15473 +15483 @@
                                 07221B7B17CEC32700848E51 /* RTCSessionDescription.h */,
                                 07221B7C17CEC32700848E51 /* RTCSessionDescription.idl */,
-                                07221B8317CEC32700848E51 /* RTCStatsReport.cpp */,
                                 07221B8417CEC32700848E51 /* RTCStatsReport.h */,
                                 07221B8517CEC32700848E51 /* RTCStatsReport.idl */,
@@ -18008 +18017 @@
                                 9908B0FD1BCAD07D00ED0F65 /* ReadableStreamInternalsBuiltins.cpp */,
                                 9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */,
+                                9908B0FD1BCAD07D00ED0F66 /* JSDOMBindingInternalsBuiltins.cpp */,
+                                9B03D8061BB3110D00B764DA /* JSDOMBindingInternalsBuiltins.h */,
                                 5E2C43751BCF9A0B0001E2BC /* RTCPeerConnectionBuiltins.cpp */,
                                 5E2C43761BCF9A0B0001E2BC /* RTCPeerConnectionBuiltins.h */,
@@ -22526 +22537 @@
                                 93B70D4809EB0C7C009D8468 /* JSDOMBinding.h */,
                                 7C45C9C61E3E8ABA00AAB558 /* JSDOMBindingCaller.h */,
+                                41DEFCB21E56C1B9000D9E5F /* JSDOMBindingInternals.js */,
                                 7C45C9CA1E3E8D2E00AAB558 /* JSDOMBindingSecurity.cpp */,
                                 7C45C9C91E3E8CD700AAB558 /* JSDOMBindingSecurity.h */,
@@ -22534 +22546 @@
                                 7C2BDD3B17C7F98B0038FF15 /* JSDOMGlobalObjectTask.cpp */,
                                 7C2BDD3C17C7F98B0038FF15 /* JSDOMGlobalObjectTask.h */,
+                                41A1B01A1E542396007F3769 /* JSDOMGuardedObject.h */,
+                                41A1B01B1E542396007F3769 /* JSDOMGuardedObject.cpp */,
                                 4138F8551D253EEE001CB61E /* JSDOMIterator.cpp */,
                                 4138F8561D253EEE001CB61E /* JSDOMIterator.h */,
+                                41DEFCB31E56C1B9000D9E5F /* JSDOMMapLike.cpp */,
+                                41DEFCB41E56C1B9000D9E5F /* JSDOMMapLike.h */,
                                 E172AF8D1811BC3700FBADB9 /* JSDOMPromise.cpp */,
                                 E172AF8E1811BC3700FBADB9 /* JSDOMPromise.h */,
@@ -25668 +25684 @@
                                 26E944D91AC4B2DD007B85B5 /* CombinedURLFilters.h in Headers */,
                                 A584FE351864D5AF00843B10 /* CommandLineAPIHost.h in Headers */,
+                                41DEFCB61E56C1BD000D9E5F /* JSDOMMapLike.h in Headers */,
                                 A584FE2C1863870F00843B10 /* CommandLineAPIModule.h in Headers */,
                                 A584FE2618637DAB00843B10 /* CommandLineAPIModuleSource.h in Headers */,
@@ -27344 +27361 @@
                                 FFEFAB2A18380DA000514534 /* LineLayoutState.h in Headers */,
                                 FFDBC047183D27B700407109 /* LineWidth.h in Headers */,
+                                41A1B01C1E54239B007F3769 /* JSDOMGuardedObject.h in Headers */,
                                 A7AD2F880EC89D07008AB002 /* LinkHash.h in Headers */,
                                 CBA9DC0B1DF44DF40005675C /* LinkHeader.h in Headers */,
@@ -27830 +27848 @@
                                 416E6FE91BBD12E5000A6043 /* ReadableStreamBuiltins.h in Headers */,
                                 416E6FE81BBD12DF000A3F64 /* ReadableStreamInternalsBuiltins.h in Headers */,
+                                416E6FE81BBD12DF000A3F65 /* JSDOMBindingInternalsBuiltins.h in Headers */,
                                 FD31603C12B0267600C1A359 /* RealtimeAnalyser.h in Headers */,
                                 41103AAD1E39791000769F03 /* RealtimeIncomingAudioSource.h in Headers */,
@@ -29753 +29772 @@
                                 31288E740E3005D6003619AE /* CSSKeyframesRule.cpp in Sources */,
                                 BC772E16133162C2001EC9CE /* CSSLineBoxContainValue.cpp in Sources */,
+                                41DEFCB51E56C1BD000D9E5F /* JSDOMMapLike.cpp in Sources */,
                                 946D37491D6D06280077084F /* CSSMarkup.cpp in Sources */,
                                 A80E6CFC0A1989CA007FB8C5 /* CSSMediaRule.cpp in Sources */,
@@ -31778 +31798 @@
                                 078E090C17D14CEE00420AA1 /* RTCSessionDescription.cpp in Sources */,
                                 073BE34E17D180B2002BD431 /* RTCSessionDescriptionDescriptor.cpp in Sources */,
-                                078E090E17D14CEE00420AA1 /* RTCStatsReport.cpp in Sources */,
                                 5E2C43671BCEE3770001E2BC /* RTCTrackEvent.cpp in Sources */,
                                 5824ABA21AE81116009074B7 /* RubyElement.cpp in Sources */,
@@ -31912 +31931 @@
                                 49E911CC0EF86D47009D0CAF /* SkewTransformOperation.cpp in Sources */,
                                 4150F9F212B6E0E70008C860 /* SliderThumbElement.cpp in Sources */,
+                                41A1B01D1E54239E007F3769 /* JSDOMGuardedObject.cpp in Sources */,
                                 9B532EA31BA928570038A827 /* SlotAssignment.cpp in Sources */,
                                 4B6FA6F70C39E4A100087011 /* SmartReplaceCF.cpp in Sources */,

trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp

@@ -206 +206 @@
             visitor.append(constructor);
 
-        for (auto& deferredPromise : thisObject->deferredPromises(locker))
-            deferredPromise->visitAggregate(visitor);
+        for (auto& guarded : thisObject->guardedObjects(locker))
+            guarded->visitAggregate(visitor);
     }
 

trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h

@@ -35 +35 @@
 namespace WebCore {
 
-    class DeferredPromise;
+    class DOMGuardedObject;
     class Document;
     class Event;
@@ -43 +43 @@
     typedef HashMap<const JSC::ClassInfo*, JSC::WriteBarrier<JSC::Structure>> JSDOMStructureMap;
     typedef HashMap<const JSC::ClassInfo*, JSC::WriteBarrier<JSC::JSObject>> JSDOMConstructorMap;
-    typedef HashSet<DeferredPromise*> DeferredPromiseSet;
+    typedef HashSet<DOMGuardedObject*> DOMGuardedObjectSet;
 
     class WEBCORE_EXPORT JSDOMGlobalObject : public JSC::JSGlobalObject {
@@ -57 +57 @@
     public:
         Lock& gcLock() { return m_gcLock; }
-        
+
         JSDOMStructureMap& structures(const AbstractLocker&) { return m_structures; }
         JSDOMConstructorMap& constructors(const AbstractLocker&) { return m_constructors; }
 
-        DeferredPromiseSet& deferredPromises(const AbstractLocker&) { return m_deferredPromises; }
+        DOMGuardedObjectSet& guardedObjects(const AbstractLocker&) { return m_guardedObjects; }
 
         ScriptExecutionContext* scriptExecutionContext() const;
@@ -95 +95 @@
         JSDOMStructureMap m_structures;
         JSDOMConstructorMap m_constructors;
-        DeferredPromiseSet m_deferredPromises;
+        DOMGuardedObjectSet m_guardedObjects;
 
         Event* m_currentEvent;

trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp

@@ -39 +39 @@
 namespace WebCore {
 
-DeferredPromise::DeferredPromise(JSDOMGlobalObject& globalObject, JSPromiseDeferred& promiseDeferred)
-    : ActiveDOMCallback(globalObject.scriptExecutionContext())
-    , m_deferred(&promiseDeferred)
-    , m_globalObject(&globalObject)
-{
-    auto locker = lockDuringMarking(globalObject.vm().heap, globalObject.gcLock());
-    globalObject.vm().heap.writeBarrier(&globalObject, &promiseDeferred);
-    globalObject.deferredPromises(locker).add(this);
-}
-
-DeferredPromise::~DeferredPromise()
-{
-    clear();
-}
-
-void DeferredPromise::clear()
-{
-    ASSERT(!m_deferred || m_globalObject);
-    if (m_deferred && m_globalObject) {
-        auto locker = lockDuringMarking(m_globalObject->vm().heap, m_globalObject->gcLock());
-        m_globalObject->deferredPromises(locker).remove(this);
-    }
-    m_deferred.clear();
-}
-
-void DeferredPromise::contextDestroyed()
-{
-    ActiveDOMCallback::contextDestroyed();
-    clear();
-}
-
 JSC::JSValue DeferredPromise::promise() const
 {
-    ASSERT(m_deferred);
-    return m_deferred->promise();
+    ASSERT(deferred());
+    return deferred()->promise();
 }
 
@@ -98 +67 @@
         return;
 
-    ASSERT(m_deferred);
+    ASSERT(deferred());
     ASSERT(m_globalObject);
     auto& state = *m_globalObject->globalExec();
@@ -110 +79 @@
         return;
 
-    ASSERT(m_deferred);
+    ASSERT(deferred());
     ASSERT(m_globalObject);
     auto& state = *m_globalObject->globalExec();
@@ -122 +91 @@
         return;
 
-    ASSERT(m_deferred);
+    ASSERT(deferred());
     ASSERT(m_globalObject);
     auto& state = *m_globalObject->globalExec();
@@ -134 +103 @@
         return;
 
-    ASSERT(m_deferred);
+    ASSERT(deferred());
     ASSERT(m_globalObject);
     JSC::ExecState* state = m_globalObject->globalExec();
@@ -146 +115 @@
         return;
 
-    ASSERT(m_deferred);
+    ASSERT(deferred());
     ASSERT(m_globalObject);
     JSC::ExecState* state = m_globalObject->globalExec();

trunk/Source/WebCore/bindings/js/JSDOMPromise.h

@@ -26 +26 @@
 #pragma once
 
-#include "ActiveDOMCallback.h"
 #include "JSDOMConvert.h"
-#include <heap/StrongInlines.h>
+#include "JSDOMGuardedObject.h"
 #include <runtime/JSPromiseDeferred.h>
 
 namespace WebCore {
 
-class DeferredPromise : public RefCounted<DeferredPromise>, public ActiveDOMCallback {
+class DeferredPromise : public DOMGuarded<JSC::JSPromiseDeferred> {
 public:
     static Ref<DeferredPromise> create(JSDOMGlobalObject& globalObject, JSC::JSPromiseDeferred& deferred)
@@ -40 +39 @@
     }
 
-    ~DeferredPromise();
-
-    template<class IDLType> 
+    template<class IDLType>
     void resolve(typename IDLType::ParameterType value)
     {
         if (isSuspended())
             return;
-        ASSERT(m_deferred);
-        ASSERT(m_globalObject);
-        JSC::ExecState* exec = m_globalObject->globalExec();
-        JSC::JSLockHolder locker(exec);
-        resolve(*exec, toJS<IDLType>(*exec, *m_globalObject.get(), std::forward<typename IDLType::ParameterType>(value)));
+        ASSERT(deferred());
+        ASSERT(globalObject());
+        JSC::ExecState* exec = globalObject()->globalExec();
+        JSC::JSLockHolder locker(exec);
+        resolve(*exec, toJS<IDLType>(*exec, *globalObject(), std::forward<typename IDLType::ParameterType>(value)));
     }
 
@@ -58 +55 @@
         if (isSuspended())
             return;
-        ASSERT(m_deferred);
-        ASSERT(m_globalObject);
-        JSC::ExecState* exec = m_globalObject->globalExec();
+        ASSERT(deferred());
+        ASSERT(globalObject());
+        JSC::ExecState* exec = globalObject()->globalExec();
         JSC::JSLockHolder locker(exec);
         resolve(*exec, JSC::jsUndefined());
@@ -70 +67 @@
         if (isSuspended())
             return;
-        ASSERT(m_deferred);
-        ASSERT(m_globalObject);
-        JSC::ExecState* exec = m_globalObject->globalExec();
-        JSC::JSLockHolder locker(exec);
-        resolve(*exec, toJSNewlyCreated<IDLType>(*exec, *m_globalObject.get(), std::forward<typename IDLType::ParameterType>(value)));
-    }
-
-    template<class IDLType> 
+        ASSERT(deferred());
+        ASSERT(globalObject());
+        JSC::ExecState* exec = globalObject()->globalExec();
+        JSC::JSLockHolder locker(exec);
+        resolve(*exec, toJSNewlyCreated<IDLType>(*exec, *globalObject(), std::forward<typename IDLType::ParameterType>(value)));
+    }
+
+    template<class IDLType>
     void reject(typename IDLType::ParameterType value)
     {
         if (isSuspended())
             return;
-        ASSERT(m_deferred);
-        ASSERT(m_globalObject);
-        JSC::ExecState* exec = m_globalObject->globalExec();
-        JSC::JSLockHolder locker(exec);
-        reject(*exec, toJS<IDLType>(*exec, *m_globalObject.get(), std::forward<typename IDLType::ParameterType>(value)));
+        ASSERT(deferred());
+        ASSERT(globalObject());
+        JSC::ExecState* exec = globalObject()->globalExec();
+        JSC::JSLockHolder locker(exec);
+        reject(*exec, toJS<IDLType>(*exec, *globalObject(), std::forward<typename IDLType::ParameterType>(value)));
     }
 
@@ -100 +97 @@
         if (isSuspended())
             return;
-        ASSERT(m_deferred);
-        ASSERT(m_globalObject);
-        JSC::ExecState* exec = m_globalObject->globalExec();
-        JSC::JSLockHolder locker(exec);
-        resolve(*exec, callback(*exec, *m_globalObject.get()));
+        ASSERT(deferred());
+        ASSERT(globalObject());
+        JSC::ExecState* exec = globalObject()->globalExec();
+        JSC::JSLockHolder locker(exec);
+        resolve(*exec, callback(*exec, *globalObject()));
     }
 
@@ -112 +109 @@
         if (isSuspended())
             return;
-        ASSERT(m_deferred);
-        ASSERT(m_globalObject);
-        JSC::ExecState* exec = m_globalObject->globalExec();
-        JSC::JSLockHolder locker(exec);
-        reject(*exec, callback(*exec, *m_globalObject.get()));
+        ASSERT(deferred());
+        ASSERT(globalObject());
+        JSC::ExecState* exec = globalObject()->globalExec();
+        JSC::JSLockHolder locker(exec);
+        reject(*exec, callback(*exec, *globalObject()));
     }
 
     JSC::JSValue promise() const;
 
-    bool isSuspended() { return !m_deferred || !canInvokeCallback(); } // The wrapper world has gone away or active DOM objects have been suspended.
-    JSDOMGlobalObject* globalObject() { return m_globalObject.get(); }
-
-    void visitAggregate(JSC::SlotVisitor& visitor) { visitor.append(m_deferred); }
-
 private:
-    DeferredPromise(JSDOMGlobalObject&, JSC::JSPromiseDeferred&);
-
-    void clear();
-    void contextDestroyed() override;
+    DeferredPromise(JSDOMGlobalObject& globalObject, JSC::JSPromiseDeferred& deferred) : DOMGuarded<JSC::JSPromiseDeferred>(globalObject, deferred) { }
+
+    JSC::JSPromiseDeferred* deferred() const { return guarded(); }
 
     void callFunction(JSC::ExecState&, JSC::JSValue function, JSC::JSValue resolution);
-    void resolve(JSC::ExecState& state, JSC::JSValue resolution) { callFunction(state, m_deferred->resolve(), resolution); }
-    void reject(JSC::ExecState& state, JSC::JSValue resolution) { callFunction(state, m_deferred->reject(), resolution); }
-
-    JSC::Weak<JSC::JSPromiseDeferred> m_deferred;
-    JSC::Weak<JSDOMGlobalObject> m_globalObject;
+    void resolve(JSC::ExecState& state, JSC::JSValue resolution) { callFunction(state, deferred()->resolve(), resolution); }
+    void reject(JSC::ExecState& state, JSC::JSValue resolution) { callFunction(state, deferred()->reject(), resolution); }
 };
 

trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h

@@ -36 +36 @@
     macro(associatedReadableByteStreamController) \
     macro(autoAllocateChunkSize) \
+    macro(backingMap) \
     macro(body) \
     macro(byobRequest) \

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -1065 +1065 @@
 
     $count += scalar @{$interface->iterable->functions} if $interface->iterable;
+    $count += scalar @{$interface->mapLike->functions} if $interface->mapLike;
     $count += scalar @{$interface->serializable->functions} if $interface->serializable;
 
@@ -2282 +2283 @@
     return 0 if !$propertyCount;
 
-    foreach my $attribute (@{$interface->attributes}) {
+    my @attributes = @{$interface->attributes};
+    push(@attributes, @{$interface->mapLike->attributes}) if $interface->mapLike;
+
+    foreach my $attribute (@attributes) {
         next if ($attribute->isStatic);
         next if AttributeShouldBeOnInstance($interface, $attribute) != $isInstance;
@@ -2323 +2327 @@
     my @functions = @{$interface->functions};
     push(@functions, @{$interface->iterable->functions}) if IsKeyValueIterableInterface($interface);
+    push(@functions, @{$interface->mapLike->functions}) if $interface->mapLike;
     push(@functions, @{$interface->serializable->functions}) if $interface->serializable;
     foreach my $function (@functions) {
@@ -2989 +2994 @@
 {
     my ($interface) = @_;
-    
+
+    # FIXME: This should return 1 for maplike once we support them.
+    return 1 if $interface->mapLike;
+
     return 1 if $interface->iterable;
     if (GetIndexedGetterFunction($interface)) {
@@ -2995 +3003 @@
         return 1 if $lengthAttribute and $codeGenerator->IsIntegerType($lengthAttribute->type);
     }
-    # FIXME: This should return 1 for maplike and setlike once we support them.
     return 0;
 }
@@ -3041 +3048 @@
     my @functions = @{$interface->functions};
     push(@functions, @{$interface->iterable->functions}) if IsKeyValueIterableInterface($interface);
+    push(@functions, @{$interface->mapLike->functions}) if $interface->mapLike;
     push(@functions, @{$interface->serializable->functions}) if $interface->serializable;
+
+    my @attributes = @{$interface->attributes};
+    push(@attributes, @{$interface->mapLike->attributes}) if $interface->mapLike;
 
     my $numConstants = @{$interface->constants};
     my $numFunctions = @functions;
-    my $numAttributes = @{$interface->attributes};
+    my $numAttributes = @attributes;
 
     if ($numFunctions > 0) {
@@ -3091 +3102 @@
         push(@implContent, "// Attributes\n\n");
 
-        foreach my $attribute (@{$interface->attributes}) {
+        foreach my $attribute (@attributes) {
             next if $attribute->extendedAttributes->{ForwardDeclareInHeader};
             next if IsJSBuiltin($interface, $attribute);
@@ -3105 +3116 @@
             push(@implContent, "#endif\n") if $conditionalString;
         }
-        
+
         if (NeedsConstructorProperty($interface)) {
             my $getter = "js" . $interfaceName . "Constructor";
@@ -3359 +3370 @@
                 my $functionName = GetFunctionName($interface, $className, @{$interface->iterable->functions}[0]);
                 push(@implContent, "    putDirect(vm, vm.propertyNames->iteratorSymbol, JSFunction::create(vm, globalObject(), 0, ASCIILiteral(\"[Symbol.Iterator]\"), $functionName), DontEnum);\n");
+            } elsif ($interface->mapLike) {
+                push(@implContent, "    putDirect(vm, vm.propertyNames->iteratorSymbol, getDirect(vm, vm.propertyNames->builtinNames().valuesPublicName()), DontEnum);\n");
             } else {
                 AddToImplIncludes("<builtins/BuiltinNames.h>");
@@ -3434 +3447 @@
         push(@implContent, "    putDirect(vm, vm.propertyNames->toPrimitiveSymbol, jsUndefined(), DontDelete | ReadOnly | DontEnum);\n");
     }
+    push(@implContent, "    synchronizeBackingMap(*globalObject()->globalExec(), *globalObject(), *this);\n") if $interface->mapLike;
 
     # Support for RuntimeEnabled attributes on instances.
@@ -3587 +3601 @@
     $numAttributes = $numAttributes + 1 if NeedsConstructorProperty($interface);
     if ($numAttributes > 0) {
-        foreach my $attribute (@{$interface->attributes}) {
+        foreach my $attribute (@attributes) {
             next if IsJSBuiltin($interface, $attribute);
 
@@ -3696 +3710 @@
                 } elsif ($attribute->isStatic) {
                     $functionName = "${interfaceName}::${functionName}";
+                } elsif ($attribute->isMapLike) {
+                    my $ucPropertyName = $codeGenerator->WK_ucfirst($functionName);
+                    $functionName = "forward" . $codeGenerator->WK_ucfirst($functionName) . "ToMapLike";
+                    push(@arguments, "state");
+                    push(@arguments, "thisObject");
                 } else {
                     $functionName = "impl.${functionName}";
@@ -3702 +3721 @@
                 unshift(@arguments, @callWithArgs);
                 my $jsType = NativeToJSValueUsingReferences($attribute, $interface, "${functionName}(" . join(", ", @arguments) . ")", "thisObject");
-                push(@implContent, "    auto& impl = thisObject.wrapped();\n") if !$attribute->isStatic;
+                push(@implContent, "    auto& impl = thisObject.wrapped();\n") unless $attribute->isStatic or $attribute->isMapLike;
                 push(@implContent, "    JSValue result = $jsType;\n");
 
@@ -3777 +3796 @@
     }
 
-    foreach my $attribute (@{$interface->attributes}) {
+    foreach my $attribute (@attributes) {
         if (!IsReadonly($attribute)) {
             next if IsJSBuiltin($interface, $attribute);
@@ -3952 +3971 @@
     if ($numFunctions > 0) {
         my $inAppleCopyright = 0;
-        foreach my $function (@{$interface->functions}) {
+        foreach my $function (@functions) {
             next if IsJSBuiltin($interface, $function);
+            next if $function->isIterable;
+            next if $function->isSerializer;
             if ($function->extendedAttributes->{AppleCopyright}) {
                 if (!$inAppleCopyright) {
@@ -4081 +4102 @@
                     push(@implContent, "    return JSValue::encode(castedThis->" . $functionImplementationName . "(*state));\n");
                 } else {
-                    push(@implContent, "    auto& impl = castedThis->wrapped();\n");
+                    push(@implContent, "    auto& impl = castedThis->wrapped();\n") unless $function->isMapLike;
 
                     GenerateArgumentsCountCheck(\@implContent, $function, $interface);
@@ -4171 +4192 @@
     GenerateImplementationIterableFunctions($interface) if $interface->iterable;
     GenerateSerializerFunction($interface, $className) if $interface->serializable;
+    AddToImplIncludes("JSDOMMapLike.h") if $interface->mapLike;
 
     if ($needsVisitChildren) {
@@ -4653 +4675 @@
     if ($implementedBy) {
         AddToImplIncludes("${implementedBy}.h", $conditional);
-        unshift(@arguments, "impl") if !$function->isStatic;
+        unshift(@arguments, "impl") unless $function->isStatic;
         $functionName = "WebCore::${implementedBy}::${functionImplementationName}";
     } elsif ($function->isStatic || $isConstructor) {
         $functionName = "${interfaceName}::${functionImplementationName}";
-    } else {
+    } elsif ($function->isMapLike) {
+        $functionName = "forward" . $codeGenerator->WK_ucfirst($function->name) . "ToMapLike";
+        push(@arguments, "*state");
+        push(@arguments, "*castedThis");
+     } else {
         $functionName = "impl.${functionImplementationName}";
     }

trunk/Source/WebCore/bindings/scripts/IDLParser.pm

@@ -61 +61 @@
     functions => '@',    # List of 'IDLOperation'
     anonymousFunctions => '@', # List of 'IDLOperation'
-    attributes => '@',    # List of 'IDLAttribute'    
+    attributes => '@',    # List of 'IDLAttribute'
     constructors => '@', # Constructors, list of 'IDLOperation'
     customConstructors => '@', # Custom constructors, list of 'IDLOperation'
@@ -68 +68 @@
     isPartial => '$', # Used for partial interfaces
     iterable => '$', # Used for iterable interfaces
+    mapLike => '$', # Used for mapLike interfaces
     serializable => '$', # Used for serializable interfaces
     extendedAttributes => '$',
@@ -88 +89 @@
     arguments => '@', # List of 'IDLArgument'
     isStatic => '$',
+    isIterable => '$',
+    isSerializer => '$',
+    isMapLike => '$',
     specials => '@',
     extendedAttributes => '$',
@@ -98 +102 @@
     type => 'IDLType',
     isStatic => '$',
+    isMapLike => '$',
     isStringifier => '$',
     isReadOnly => '$',
@@ -109 +114 @@
     valueType => 'IDLType',
     functions => '@', # Iterable functions (entries, keys, values, [Symbol.Iterator], forEach)
+    extendedAttributes => '$',
+});
+
+# https://heycam.github.io/webidl/#es-maplike
+struct( IDLMapLike => {
+    isReadOnly => '$',
+    keyType => 'IDLType',
+    valueType => 'IDLType',
+    attributes => '@', # MapLike attributes (size)
+    functions => '@', # MapLike functions (entries, keys, values, forEach, get, has and if not readonly, delete, set and clear)
     extendedAttributes => '$',
 });
@@ -195 +210 @@
 {
     my $message = shift;
-    
+
     my $mess = longmess();
     print Dumper($mess);
@@ -421 +436 @@
 }
 
-my $nextAttribute_1 = '^(attribute|inherit|readonly)$';
+my $nextAttribute_1 = '^(attribute|inherit)$';
 my $nextPrimitiveType_1 = '^(int|long|short|unsigned)$';
 my $nextPrimitiveType_2 = '^(double|float|unrestricted)$';
@@ -437 +452 @@
 my $nextDefinitions_1 = '^(callback|dictionary|enum|exception|interface|partial|typedef)$';
 my $nextExceptionMembers_1 = '^(\(|ByteString|DOMString|USVString|Date|\[|any|boolean|byte|const|double|float|long|object|octet|optional|sequence|short|unrestricted|unsigned)$';
-my $nextAttributeRest_1 = '^(attribute|readonly)$';
 my $nextInterfaceMembers_1 = '^(\(|ByteString|DOMString|USVString|Date|any|attribute|boolean|byte|const|creator|deleter|double|float|getter|inherit|legacycaller|long|object|octet|readonly|sequence|serializer|setter|short|static|stringifier|unrestricted|unsigned|void)$';
 my $nextSingleType_1 = '^(ByteString|DOMString|USVString|Date|boolean|byte|double|float|long|object|octet|sequence|short|unrestricted|unsigned)$';
@@ -1141 +1155 @@
         return $self->parseSerializer($extendedAttributeList);
     }
+
     if ($next->value() =~ /$nextAttributeOrOperation_1/) {
         my $qualifier = $self->parseQualifier();
-        my $newDataNode = $self->parseAttributeOrOperationRest($extendedAttributeList);
+        my $isReadOnly = $self->parseReadOnly();
+        my $newDataNode = $self->parseAttributeOrOperationRest($extendedAttributeList, $isReadOnly);
         if (defined($newDataNode)) {
             $newDataNode->isStatic(1) if $qualifier eq "static";
@@ -1150 +1166 @@
         return $newDataNode;
     }
+    my $isReadOnly = $self->parseReadOnly();
+    $next = $self->nextToken();
     if ($next->value() =~ /$nextAttribute_1/) {
-        return $self->parseAttribute($extendedAttributeList);
+        return $self->parseAttribute($extendedAttributeList, $isReadOnly);
     }
     if ($next->type() == IdentifierToken || $next->value() =~ /$nextAttributeOrOperation_2/) {
-        return $self->parseOperationOrIterator($extendedAttributeList);
+        return $self->parseOperationOrIterator($extendedAttributeList, $isReadOnly);
     }
     $self->assertUnexpectedToken($next->value(), __LINE__);
@@ -1179 +1197 @@
         $toJSONFunction->name("toJSON");
         $toJSONFunction->extendedAttributes($extendedAttributeList);
+        $toJSONFunction->isSerializer(1);
         push(@{$newDataNode->functions}, $toJSONFunction);
 
@@ -1316 +1335 @@
     my $self = shift;
     my $extendedAttributeList = shift;
-
-    my $next = $self->nextToken();
-    if ($next->value() =~ /$nextAttributeRest_1/) {
-        return $self->parseAttributeRest($extendedAttributeList);
+    my $isReadOnly = shift;
+
+    my $next = $self->nextToken();
+    if ($next->value() eq "attribute") {
+        return $self->parseAttributeRest($extendedAttributeList, $isReadOnly);
     }
     if ($next->value() eq ";") {
@@ -1340 +1360 @@
     my $self = shift;
     my $extendedAttributeList = shift;
+    my $isReadOnly = shift;
 
     my $next = $self->nextToken();
     if ($next->value() =~ /$nextAttribute_1/) {
         $self->parseInherit();
-        return $self->parseAttributeRest($extendedAttributeList);
+        return $self->parseAttributeRest($extendedAttributeList, $isReadOnly);
     }
     $self->assertUnexpectedToken($next->value(), __LINE__);
@@ -1353 +1374 @@
     my $self = shift;
     my $extendedAttributeList = shift;
-
-    my $next = $self->nextToken();
-    if ($next->value() =~ /$nextAttributeRest_1/) {
+    my $isReadOnly = shift;
+
+    my $next = $self->nextToken();
+    if ($next->value() eq "attribute") {
         my $newDataNode = IDLAttribute->new();
-        $newDataNode->isReadOnly($self->parseReadOnly());
+        $newDataNode->isReadOnly($isReadOnly);
 
         $self->assertTokenValue($self->getToken(), "attribute", __LINE__);
-        
+
         my $type = $self->parseType();
         $newDataNode->type($type);
@@ -1406 +1428 @@
     my $self = shift;
     my $extendedAttributeList = shift;
+    my $isReadOnly = shift;
 
     my $next = $self->nextToken();
@@ -1413 +1436 @@
     if ($next->value() eq "iterable") {
         return $self->parseIterableRest($extendedAttributeList);
+    }
+    if ($next->value() eq "maplike") {
+        return $self->parseMapLikeRest($extendedAttributeList, $isReadOnly);
     }
     if ($next->type() == IdentifierToken || $next->value() =~ /$nextAttributeOrOperationRest_1/) {
@@ -1509 +1535 @@
     my $extendedAttributeList = shift;
 
-    my $symbolIteratorFunction = IDLOperation->new();
-    $symbolIteratorFunction->name("[Symbol.Iterator]");
-    $symbolIteratorFunction->extendedAttributes($extendedAttributeList);
-
-    my $entriesFunction = IDLOperation->new();
-    $entriesFunction->name("entries");
-    $entriesFunction->extendedAttributes($extendedAttributeList);
-
-    my $keysFunction = IDLOperation->new();
-    $keysFunction->name("keys");
-    $keysFunction->extendedAttributes($extendedAttributeList);
-
-    my $valuesFunction = IDLOperation->new();
-    $valuesFunction->name("values");
-    $valuesFunction->extendedAttributes($extendedAttributeList);
-
-    my $forEachFunction = IDLOperation->new();
-    $forEachFunction->name("forEach");
-    $forEachFunction->extendedAttributes($extendedAttributeList);
-    my $forEachArgument = IDLArgument->new();
-    $forEachArgument->name("callback");
-    $forEachArgument->type(makeSimpleType("any"));
-    push(@{$forEachFunction->arguments}, ($forEachArgument));
-
     my $newDataNode = IDLIterable->new();
     $newDataNode->extendedAttributes($extendedAttributeList);
-    push(@{$newDataNode->functions}, $symbolIteratorFunction);
-    push(@{$newDataNode->functions}, $entriesFunction);
-    push(@{$newDataNode->functions}, $keysFunction);
-    push(@{$newDataNode->functions}, $valuesFunction);
-    push(@{$newDataNode->functions}, $forEachFunction);
 
     $self->assertTokenValue($self->getToken(), "<", __LINE__);
@@ -1557 +1554 @@
     $self->assertTokenValue($self->getToken(), ">", __LINE__);
 
+    my $symbolIteratorFunction = IDLOperation->new();
+    $symbolIteratorFunction->name("[Symbol.Iterator]");
+    $symbolIteratorFunction->extendedAttributes($extendedAttributeList);
+    $symbolIteratorFunction->isIterable(1);
+
+    my $entriesFunction = IDLOperation->new();
+    $entriesFunction->name("entries");
+    $entriesFunction->extendedAttributes($extendedAttributeList);
+    $entriesFunction->isIterable(1);
+
+    my $keysFunction = IDLOperation->new();
+    $keysFunction->name("keys");
+    $keysFunction->extendedAttributes($extendedAttributeList);
+    $keysFunction->isIterable(1);
+
+    my $valuesFunction = IDLOperation->new();
+    $valuesFunction->name("values");
+    $valuesFunction->extendedAttributes($extendedAttributeList);
+    $valuesFunction->isIterable(1);
+
+    my $forEachFunction = IDLOperation->new();
+    $forEachFunction->name("forEach");
+    $forEachFunction->extendedAttributes($extendedAttributeList);
+    $forEachFunction->isIterable(1);
+    my $forEachArgument = IDLArgument->new();
+    $forEachArgument->name("callback");
+    $forEachArgument->type(makeSimpleType("any"));
+    push(@{$forEachFunction->arguments}, ($forEachArgument));
+
+    push(@{$newDataNode->functions}, $symbolIteratorFunction);
+    push(@{$newDataNode->functions}, $entriesFunction);
+    push(@{$newDataNode->functions}, $keysFunction);
+    push(@{$newDataNode->functions}, $valuesFunction);
+    push(@{$newDataNode->functions}, $forEachFunction);
+
+    return $newDataNode;
+}
+
+sub parseMapLikeRest
+{
+    my $self = shift;
+    my $extendedAttributeList = shift;
+    my $isReadOnly = shift;
+
+    my $next = $self->nextToken();
+    if ($next->value() eq "maplike") {
+        $self->assertTokenValue($self->getToken(), "maplike", __LINE__);
+        my $mapLikeNode = $self->parseMapLikeProperties($extendedAttributeList, $isReadOnly);
+        $self->assertTokenValue($self->getToken(), ";", __LINE__);
+        return $mapLikeNode;
+    }
+    $self->assertUnexpectedToken($next->value(), __LINE__);
+}
+
+sub parseMapLikeProperties
+{
+    my $self = shift;
+    my $extendedAttributeList = shift;
+    my $isReadOnly = shift;
+
+    my $newDataNode = IDLMapLike->new();
+    $newDataNode->extendedAttributes($extendedAttributeList);
+    $newDataNode->isReadOnly($isReadOnly);
+
+    $self->assertTokenValue($self->getToken(), "<", __LINE__);
+    $newDataNode->keyType($self->parseType());
+    $self->assertTokenValue($self->getToken(), ",", __LINE__);
+    $newDataNode->valueType($self->parseType());
+    $self->assertTokenValue($self->getToken(), ">", __LINE__);
+
+    my $notEnumerableExtendedAttributeList = $extendedAttributeList;
+    $notEnumerableExtendedAttributeList->{NotEnumerable} = 1;
+
+    my $sizeAttribute = IDLAttribute->new();
+    $sizeAttribute->name("size");
+    $sizeAttribute->isMapLike(1);
+    $sizeAttribute->extendedAttributes($extendedAttributeList);
+    $sizeAttribute->isReadOnly(1);
+    $sizeAttribute->type(makeSimpleType("any"));
+    push(@{$newDataNode->attributes}, $sizeAttribute);
+
+    my $getFunction = IDLOperation->new();
+    $getFunction->name("get");
+    $getFunction->isMapLike(1);
+    my $getArgument = IDLArgument->new();
+    $getArgument->name("key");
+    $getArgument->type($newDataNode->keyType);
+    $getArgument->extendedAttributes($extendedAttributeList);
+    push(@{$getFunction->arguments}, ($getArgument));
+    $getFunction->extendedAttributes($notEnumerableExtendedAttributeList);
+    $getFunction->type(makeSimpleType("any"));
+
+    my $hasFunction = IDLOperation->new();
+    $hasFunction->name("has");
+    $hasFunction->isMapLike(1);
+    my $hasArgument = IDLArgument->new();
+    $hasArgument->name("key");
+    $hasArgument->type($newDataNode->keyType);
+    $hasArgument->extendedAttributes($extendedAttributeList);
+    push(@{$hasFunction->arguments}, ($hasArgument));
+    $hasFunction->extendedAttributes($notEnumerableExtendedAttributeList);
+    $hasFunction->type(makeSimpleType("any"));
+
+    my $entriesFunction = IDLOperation->new();
+    $entriesFunction->name("entries");
+    $entriesFunction->isMapLike(1);
+    $entriesFunction->extendedAttributes($notEnumerableExtendedAttributeList);
+    $entriesFunction->type(makeSimpleType("any"));
+
+    my $keysFunction = IDLOperation->new();
+    $keysFunction->name("keys");
+    $keysFunction->isMapLike(1);
+    $keysFunction->extendedAttributes($notEnumerableExtendedAttributeList);
+    $keysFunction->type(makeSimpleType("any"));
+
+    my $valuesFunction = IDLOperation->new();
+    $valuesFunction->name("values");
+    $valuesFunction->isMapLike(1);
+    $valuesFunction->extendedAttributes($extendedAttributeList);
+    $valuesFunction->extendedAttributes->{NotEnumerable} = 1;
+    $valuesFunction->type(makeSimpleType("any"));
+
+    my $forEachFunction = IDLOperation->new();
+    $forEachFunction->name("forEach");
+    $forEachFunction->isMapLike(1);
+    $forEachFunction->extendedAttributes({});
+    $forEachFunction->type(makeSimpleType("any"));
+    my $forEachArgument = IDLArgument->new();
+    $forEachArgument->name("callback");
+    $forEachArgument->type(makeSimpleType("any"));
+    $forEachArgument->extendedAttributes($extendedAttributeList);
+    push(@{$forEachFunction->arguments}, ($forEachArgument));
+
+    push(@{$newDataNode->functions}, $getFunction);
+    push(@{$newDataNode->functions}, $hasFunction);
+    push(@{$newDataNode->functions}, $entriesFunction);
+    push(@{$newDataNode->functions}, $keysFunction);
+    push(@{$newDataNode->functions}, $valuesFunction);
+    push(@{$newDataNode->functions}, $forEachFunction);
+
+    return $newDataNode if $isReadOnly;
+
+    my $addFunction = IDLOperation->new();
+    $addFunction->name("add");
+    $addFunction->isMapLike(1);
+    my $addArgument = IDLArgument->new();
+    $addArgument->name("key");
+    $addArgument->type($newDataNode->keyType);
+    $addArgument->extendedAttributes($extendedAttributeList);
+    push(@{$addFunction->arguments}, ($addArgument));
+    $addFunction->extendedAttributes($notEnumerableExtendedAttributeList);
+    $addFunction->type(makeSimpleType("any"));
+
+    my $clearFunction = IDLOperation->new();
+    $clearFunction->name("clear");
+    $clearFunction->isMapLike(1);
+    $clearFunction->extendedAttributes($notEnumerableExtendedAttributeList);
+    $clearFunction->type(makeSimpleType("void"));
+
+    my $deleteFunction = IDLOperation->new();
+    $deleteFunction->name("delete");
+    $deleteFunction->isMapLike(1);
+    my $deleteArgument = IDLArgument->new();
+    $deleteArgument->name("key");
+    $deleteArgument->type($newDataNode->keyType);
+    $deleteArgument->extendedAttributes($extendedAttributeList);
+    push(@{$deleteFunction->arguments}, ($deleteArgument));
+    $deleteFunction->extendedAttributes($notEnumerableExtendedAttributeList);
+    $deleteFunction->type(makeSimpleType("any"));
+
+    push(@{$newDataNode->functions}, $addFunction);
+    push(@{$newDataNode->functions}, $clearFunction);
+    push(@{$newDataNode->functions}, $deleteFunction);
+
     return $newDataNode;
 }
@@ -1571 +1742 @@
         my $name = $self->parseOptionalIdentifier();
         $newDataNode->name(identifierRemoveNullablePrefix($name));
-        
+
         $self->assertTokenValue($self->getToken(), "(", $name, __LINE__);
-        
+
         push(@{$newDataNode->arguments}, @{$self->parseArgumentList()});
-        
+
         $self->assertTokenValue($self->getToken(), ")", __LINE__);
         $self->assertTokenValue($self->getToken(), ";", __LINE__);
-        
+
         $newDataNode->extendedAttributes($extendedAttributeList);
         return $newDataNode;
@@ -2394 +2565 @@
             next;
         }
+        if (ref($item) eq "IDLMapLike") {
+            $interface->mapLike($item);
+            next;
+        }
         if (ref($item) eq "IDLOperation") {
             if ($item->name eq "") {