[webkit-changes] [211771] trunk/Source

Mon, 06 Feb 2017 20:26:43 -0800

Title: [211771] trunk/Source
Revision
211771
Author
commit-qu...@webkit.org
Date
2017-02-06 20:27:05 -0800 (Mon, 06 Feb 2017)

Log Message

Web Inspector: Do not use RunLoop when dispatching inspector GC event
https://bugs.webkit.org/show_bug.cgi?id=167683
<rdar://problem/30167791>

Patch by Joseph Pecoraro <pecor...@apple.com> on 2017-02-06
Reviewed by Brian Burg.

Source/_javascript_Core:

Move the RunLoop deferred implementation to WebCore. It is not needed
for JSContext inspection, and in JSContext inspection we are not
guarenteed a RunLoop to defer to.

* inspector/agents/InspectorHeapAgent.h:
* inspector/agents/InspectorHeapAgent.cpp:
(Inspector::InspectorHeapAgent::InspectorHeapAgent):
(Inspector::InspectorHeapAgent::~InspectorHeapAgent):
(Inspector::InspectorHeapAgent::disable):
(Inspector::InspectorHeapAgent::didGarbageCollect):
(Inspector::SendGarbageCollectionEventsTask::SendGarbageCollectionEventsTask): Deleted.
(Inspector::SendGarbageCollectionEventsTask::addGarbageCollection): Deleted.
(Inspector::SendGarbageCollectionEventsTask::reset): Deleted.
(Inspector::SendGarbageCollectionEventsTask::timerFired): Deleted.

(Inspector::InspectorHeapAgent::dispatchGarbageCollectedEvent):
Make a virtual method so that WebCore implementations of this agent can choose
to dispatch this event asynchronously.

* inspector/agents/InspectorScriptProfilerAgent.cpp:
Remove unnecessary RunLoop include.

Source/WebCore:

Covered by existing tests.

* CMakeLists.txt:
* WebCore.xcodeproj/project.pbxproj:
* inspector/InspectorAllInOne.cpp:
Add new file.

* inspector/PageHeapAgent.cpp:
(WebCore::PageHeapAgent::PageHeapAgent):
(WebCore::PageHeapAgent::enable):
(WebCore::PageHeapAgent::disable):
* inspector/PageHeapAgent.h:
Extend WebHeapAgent.

* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::WorkerInspectorController):
Use WebHeapAgent.

* inspector/WebHeapAgent.cpp: Added.
(WebCore::SendGarbageCollectionEventsTask::SendGarbageCollectionEventsTask):
(WebCore::SendGarbageCollectionEventsTask::addGarbageCollection):
(WebCore::SendGarbageCollectionEventsTask::reset):
(WebCore::SendGarbageCollectionEventsTask::timerFired):
(WebCore::WebHeapAgent::WebHeapAgent):
(WebCore::WebHeapAgent::~WebHeapAgent):
(WebCore::WebHeapAgent::disable):
(WebCore::WebHeapAgent::dispatchGarbageCollectedEvent):
(WebCore::WebHeapAgent::dispatchGarbageCollectionEventsAfterDelay):
* inspector/WebHeapAgent.h:
Move the defered event dispatch from InspectorHeapAgent here where a RunLoop is guarenteed.

Modified Paths

Added Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (211770 => 211771)


--- trunk/Source/_javascript_Core/ChangeLog	2017-02-07 04:23:52 UTC (rev 211770)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-02-07 04:27:05 UTC (rev 211771)
@@ -1,5 +1,35 @@
 2017-02-06  Joseph Pecoraro  <pecor...@apple.com>
 
+        Web Inspector: Do not use RunLoop when dispatching inspector GC event
+        https://bugs.webkit.org/show_bug.cgi?id=167683
+        <rdar://problem/30167791>
+
+        Reviewed by Brian Burg.
+
+        Move the RunLoop deferred implementation to WebCore. It is not needed
+        for JSContext inspection, and in JSContext inspection we are not
+        guarenteed a RunLoop to defer to.
+
+        * inspector/agents/InspectorHeapAgent.h:
+        * inspector/agents/InspectorHeapAgent.cpp:
+        (Inspector::InspectorHeapAgent::InspectorHeapAgent):
+        (Inspector::InspectorHeapAgent::~InspectorHeapAgent):
+        (Inspector::InspectorHeapAgent::disable):
+        (Inspector::InspectorHeapAgent::didGarbageCollect):
+        (Inspector::SendGarbageCollectionEventsTask::SendGarbageCollectionEventsTask): Deleted.
+        (Inspector::SendGarbageCollectionEventsTask::addGarbageCollection): Deleted.
+        (Inspector::SendGarbageCollectionEventsTask::reset): Deleted.
+        (Inspector::SendGarbageCollectionEventsTask::timerFired): Deleted.
+
+        (Inspector::InspectorHeapAgent::dispatchGarbageCollectedEvent):
+        Make a virtual method so that WebCore implementations of this agent can choose
+        to dispatch this event asynchronously.
+
+        * inspector/agents/InspectorScriptProfilerAgent.cpp:
+        Remove unnecessary RunLoop include.
+
+2017-02-06  Joseph Pecoraro  <pecor...@apple.com>
+
         Static Analyzer: JSContext.mm: Incorrect decrement of the reference count of an object
         https://bugs.webkit.org/show_bug.cgi?id=167848

Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp (211770 => 211771)


--- trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp	2017-02-07 04:23:52 UTC (rev 211770)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp	2017-02-07 04:27:05 UTC (rev 211771)
@@ -32,7 +32,6 @@
 #include "InspectorEnvironment.h"
 #include "JSCInlines.h"
 #include "VM.h"
-#include <wtf/RunLoop.h>
 #include <wtf/Stopwatch.h>
 
 using namespace JSC;
@@ -39,73 +38,6 @@
 
 namespace Inspector {
 
-struct GarbageCollectionData {
-    Inspector::Protocol::Heap::GarbageCollection::Type type;
-    double startTime;
-    double endTime;
-};
-
-class SendGarbageCollectionEventsTask {
-public:
-    SendGarbageCollectionEventsTask(HeapFrontendDispatcher&);
-    void addGarbageCollection(GarbageCollectionData&);
-    void reset();
-private:
-    void timerFired();
-
-    HeapFrontendDispatcher& m_frontendDispatcher;
-    Vector<GarbageCollectionData> m_collections;
-    RunLoop::Timer<SendGarbageCollectionEventsTask> m_timer;
-    Lock m_mutex;
-};
-
-SendGarbageCollectionEventsTask::SendGarbageCollectionEventsTask(HeapFrontendDispatcher& frontendDispatcher)
-    : m_frontendDispatcher(frontendDispatcher)
-    , m_timer(RunLoop::current(), this, &SendGarbageCollectionEventsTask::timerFired)
-{
-}
-
-void SendGarbageCollectionEventsTask::addGarbageCollection(GarbageCollectionData& collection)
-{
-    {
-        std::lock_guard<Lock> lock(m_mutex);
-        m_collections.append(collection);
-    }
-
-    if (!m_timer.isActive())
-        m_timer.startOneShot(0);
-}
-
-void SendGarbageCollectionEventsTask::reset()
-{
-    {
-        std::lock_guard<Lock> lock(m_mutex);
-        m_collections.clear();
-    }
-
-    m_timer.stop();
-}
-
-void SendGarbageCollectionEventsTask::timerFired()
-{
-    Vector<GarbageCollectionData> collectionsToSend;
-
-    {
-        std::lock_guard<Lock> lock(m_mutex);
-        m_collections.swap(collectionsToSend);
-    }
-
-    // The timer is stopped on agent destruction, so this method will never be called after agent has been destroyed.
-    for (auto& collection : collectionsToSend) {
-        auto protocolObject = Inspector::Protocol::Heap::GarbageCollection::create()
-            .setType(collection.type)
-            .setStartTime(collection.startTime)
-            .setEndTime(collection.endTime)
-            .release();
-        m_frontendDispatcher.garbageCollected(WTFMove(protocolObject));
-    }
-}
-
 InspectorHeapAgent::InspectorHeapAgent(AgentContext& context)
     : InspectorAgentBase(ASCIILiteral("Heap"))
     , m_injectedScriptManager(context.injectedScriptManager)
@@ -112,13 +44,11 @@
     , m_frontendDispatcher(std::make_unique<HeapFrontendDispatcher>(context.frontendRouter))
     , m_backendDispatcher(HeapBackendDispatcher::create(context.backendDispatcher, this))
     , m_environment(context.environment)
-    , m_sendGarbageCollectionEventsTask(std::make_unique<SendGarbageCollectionEventsTask>(*m_frontendDispatcher))
 {
 }
 
 InspectorHeapAgent::~InspectorHeapAgent()
 {
-    m_sendGarbageCollectionEventsTask->reset();
 }
 
 void InspectorHeapAgent::didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*)
@@ -152,7 +82,6 @@
     m_enabled = false;
 
     m_environment.vm().heap.removeObserver(this);
-    m_sendGarbageCollectionEventsTask->reset();
 
     clearHeapSnapshots();
 }
@@ -354,20 +283,9 @@
 
     // FIXME: Include number of bytes freed by collection.
 
-    // Dispatch the event asynchronously because this method may be
-    // called between collection and sweeping and we don't want to
-    // create unexpected _javascript_ allocations that the Sweeper does
-    // not expect to encounter. _javascript_ allocations could happen
-    // with WebKitLegacy's in process inspector which shares the same
-    // VM as the inspected page.
+    double endTime = m_environment.executionStopwatch()->elapsedTime();
+    dispatchGarbageCollectedEvent(protocolTypeForHeapOperation(scope), m_gcStartTime, endTime);
 
-    GarbageCollectionData data;
-    data.type = protocolTypeForHeapOperation(scope);
-    data.startTime = m_gcStartTime;
-    data.endTime = m_environment.executionStopwatch()->elapsedTime();
-
-    m_sendGarbageCollectionEventsTask->addGarbageCollection(data);
-
     m_gcStartTime = NAN;
 }
 
@@ -382,4 +300,15 @@
     }
 }
 
+void InspectorHeapAgent::dispatchGarbageCollectedEvent(Inspector::Protocol::Heap::GarbageCollection::Type type, double startTime, double endTime)
+{
+    auto protocolObject = Inspector::Protocol::Heap::GarbageCollection::create()
+        .setType(type)
+        .setStartTime(startTime)
+        .setEndTime(endTime)
+        .release();
+
+    m_frontendDispatcher->garbageCollected(WTFMove(protocolObject));
+}
+
 } // namespace Inspector

Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.h (211770 => 211771)


--- trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.h	2017-02-07 04:23:52 UTC (rev 211770)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.h	2017-02-07 04:27:05 UTC (rev 211771)
@@ -36,7 +36,6 @@
 namespace Inspector {
 
 class InjectedScriptManager;
-class SendGarbageCollectionEventsTask;
 typedef String ErrorString;
 
 class JS_EXPORT_PRIVATE InspectorHeapAgent : public InspectorAgentBase, public HeapBackendDispatcherHandler, public JSC::HeapObserver {
@@ -65,6 +64,8 @@
 protected:
     void clearHeapSnapshots();
 
+    virtual void dispatchGarbageCollectedEvent(Inspector::Protocol::Heap::GarbageCollection::Type, double startTime, double endTime);
+
 private:
     std::optional<JSC::HeapSnapshotNode> nodeForHeapObjectIdentifier(ErrorString&, unsigned heapObjectIdentifier);
 
@@ -73,8 +74,6 @@
     RefPtr<HeapBackendDispatcher> m_backendDispatcher;
     InspectorEnvironment& m_environment;
 
-    std::unique_ptr<SendGarbageCollectionEventsTask> m_sendGarbageCollectionEventsTask;
-
     bool m_enabled { false };
     bool m_tracking { false };
     double m_gcStartTime { NAN };

Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorScriptProfilerAgent.cpp (211770 => 211771)


--- trunk/Source/_javascript_Core/inspector/agents/InspectorScriptProfilerAgent.cpp	2017-02-07 04:23:52 UTC (rev 211770)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorScriptProfilerAgent.cpp	2017-02-07 04:27:05 UTC (rev 211771)
@@ -30,7 +30,6 @@
 #include "HeapInlines.h"
 #include "InspectorEnvironment.h"
 #include "SamplingProfiler.h"
-#include <wtf/RunLoop.h>
 #include <wtf/Stopwatch.h>
 
 using namespace JSC;

Modified: trunk/Source/WebCore/CMakeLists.txt (211770 => 211771)


--- trunk/Source/WebCore/CMakeLists.txt	2017-02-07 04:23:52 UTC (rev 211770)
+++ trunk/Source/WebCore/CMakeLists.txt	2017-02-07 04:27:05 UTC (rev 211771)
@@ -1840,6 +1840,7 @@
     inspector/TimelineRecordFactory.cpp
     inspector/WebConsoleAgent.cpp
     inspector/WebDebuggerAgent.cpp
+    inspector/WebHeapAgent.cpp
     inspector/WebInjectedScriptHost.cpp
     inspector/WebInjectedScriptManager.cpp
     inspector/WorkerConsoleAgent.cpp

Modified: trunk/Source/WebCore/ChangeLog (211770 => 211771)


--- trunk/Source/WebCore/ChangeLog	2017-02-07 04:23:52 UTC (rev 211770)
+++ trunk/Source/WebCore/ChangeLog	2017-02-07 04:27:05 UTC (rev 211771)
@@ -1,5 +1,44 @@
 2017-02-06  Joseph Pecoraro  <pecor...@apple.com>
 
+        Web Inspector: Do not use RunLoop when dispatching inspector GC event
+        https://bugs.webkit.org/show_bug.cgi?id=167683
+        <rdar://problem/30167791>
+
+        Reviewed by Brian Burg.
+
+        Covered by existing tests.
+
+        * CMakeLists.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * inspector/InspectorAllInOne.cpp:
+        Add new file.
+
+        * inspector/PageHeapAgent.cpp:
+        (WebCore::PageHeapAgent::PageHeapAgent):
+        (WebCore::PageHeapAgent::enable):
+        (WebCore::PageHeapAgent::disable):
+        * inspector/PageHeapAgent.h:
+        Extend WebHeapAgent.
+
+        * inspector/WorkerInspectorController.cpp:
+        (WebCore::WorkerInspectorController::WorkerInspectorController):
+        Use WebHeapAgent.
+
+        * inspector/WebHeapAgent.cpp: Added.
+        (WebCore::SendGarbageCollectionEventsTask::SendGarbageCollectionEventsTask):
+        (WebCore::SendGarbageCollectionEventsTask::addGarbageCollection):
+        (WebCore::SendGarbageCollectionEventsTask::reset):
+        (WebCore::SendGarbageCollectionEventsTask::timerFired):
+        (WebCore::WebHeapAgent::WebHeapAgent):
+        (WebCore::WebHeapAgent::~WebHeapAgent):
+        (WebCore::WebHeapAgent::disable):
+        (WebCore::WebHeapAgent::dispatchGarbageCollectedEvent):
+        (WebCore::WebHeapAgent::dispatchGarbageCollectionEventsAfterDelay):
+        * inspector/WebHeapAgent.h:
+        Move the defered event dispatch from InspectorHeapAgent here where a RunLoop is guarenteed.
+
+2017-02-06  Joseph Pecoraro  <pecor...@apple.com>
+
         ExtendedColor leaks seen on leaks bot
         https://bugs.webkit.org/show_bug.cgi?id=167912

Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (211770 => 211771)


--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2017-02-07 04:23:52 UTC (rev 211770)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2017-02-07 04:27:05 UTC (rev 211771)
@@ -4103,6 +4103,8 @@
 		A5AFB350115151A700B045CB /* StepRange.h in Headers */ = {isa = PBXBuildFile; fileRef = A5AFB34E115151A700B045CB /* StepRange.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		A5DEBDA316FB908700836FE0 /* WebKitPlaybackTargetAvailabilityEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5DEBD9F16FB908700836FE0 /* WebKitPlaybackTargetAvailabilityEvent.cpp */; };
 		A5DEBDA416FB908700836FE0 /* WebKitPlaybackTargetAvailabilityEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = A5DEBDA016FB908700836FE0 /* WebKitPlaybackTargetAvailabilityEvent.h */; };
+		A5E2123B1E4924A100CE1044 /* WebHeapAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5E212391E49249200CE1044 /* WebHeapAgent.cpp */; };
+		A5E2123C1E4924A400CE1044 /* WebHeapAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = A5E2123A1E49249200CE1044 /* WebHeapAgent.h */; };
 		A5E616731894581F009ADF50 /* WebDebuggerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5E616711894581F009ADF50 /* WebDebuggerAgent.cpp */; };
 		A5E616741894581F009ADF50 /* WebDebuggerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = A5E616721894581F009ADF50 /* WebDebuggerAgent.h */; };
 		A5F36D3A18F758720054C024 /* PageScriptDebugServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5F36D3818F758720054C024 /* PageScriptDebugServer.cpp */; };
@@ -11889,6 +11891,8 @@
 		A5DEBD9F16FB908700836FE0 /* WebKitPlaybackTargetAvailabilityEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitPlaybackTargetAvailabilityEvent.cpp; sourceTree = "<group>"; };
 		A5DEBDA016FB908700836FE0 /* WebKitPlaybackTargetAvailabilityEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitPlaybackTargetAvailabilityEvent.h; sourceTree = "<group>"; };
 		A5DEBDA116FB908700836FE0 /* WebKitPlaybackTargetAvailabilityEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitPlaybackTargetAvailabilityEvent.idl; sourceTree = "<group>"; };
+		A5E212391E49249200CE1044 /* WebHeapAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebHeapAgent.cpp; sourceTree = "<group>"; };
+		A5E2123A1E49249200CE1044 /* WebHeapAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHeapAgent.h; sourceTree = "<group>"; };
 		A5E616711894581F009ADF50 /* WebDebuggerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDebuggerAgent.cpp; sourceTree = "<group>"; };
 		A5E616721894581F009ADF50 /* WebDebuggerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDebuggerAgent.h; sourceTree = "<group>"; };
 		A5F36D3818F758720054C024 /* PageScriptDebugServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageScriptDebugServer.cpp; sourceTree = "<group>"; };
@@ -15406,13 +15410,9 @@
 		0729B14D17CFCCA0004F1D60 /* mac */ = {
 			isa = PBXGroup;
 			children = (
-				076EC1321E44F2CB00E5D813 /* AudioTrackPrivateMediaStreamCocoa.cpp */,
-				5CDD83391E4324BB00621E92 /* RealtimeIncomingVideoSource.cpp */,
-				5CDD833A1E4324BB00621E92 /* RealtimeIncomingVideoSource.h */,
-				5CDD833B1E4324BB00621E92 /* RealtimeOutgoingVideoSource.cpp */,
-				5CDD833C1E4324BB00621E92 /* RealtimeOutgoingVideoSource.h */,
 				07707CB11E20649C00005BF7 /* AudioCaptureSourceProviderObjC.h */,
 				07707CAF1E205EC400005BF7 /* AudioSourceObserverObjC.h */,
+				076EC1321E44F2CB00E5D813 /* AudioTrackPrivateMediaStreamCocoa.cpp */,
 				07C046C61E42512F007201E7 /* AudioTrackPrivateMediaStreamCocoa.h */,
 				070363D8181A1CDC00C074A5 /* AVAudioCaptureSource.h */,
 				070363D9181A1CDC00C074A5 /* AVAudioCaptureSource.mm */,
@@ -15428,10 +15428,14 @@
 				07EE76EE1BEA619800F89133 /* MockRealtimeVideoSourceMac.mm */,
 				41103AAA1E39790A00769F03 /* RealtimeIncomingAudioSource.cpp */,
 				41103AA91E39790A00769F03 /* RealtimeIncomingAudioSource.h */,
+				5CDD83391E4324BB00621E92 /* RealtimeIncomingVideoSource.cpp */,
+				5CDD833A1E4324BB00621E92 /* RealtimeIncomingVideoSource.h */,
 				4A0FFAA31AAF5EF60062803B /* RealtimeMediaSourceCenterMac.cpp */,
 				4A0FFAA41AAF5EF60062803B /* RealtimeMediaSourceCenterMac.h */,
 				41103AA71E39790A00769F03 /* RealtimeOutgoingAudioSource.cpp */,
 				41103AA81E39790A00769F03 /* RealtimeOutgoingAudioSource.h */,
+				5CDD833B1E4324BB00621E92 /* RealtimeOutgoingVideoSource.cpp */,
+				5CDD833C1E4324BB00621E92 /* RealtimeOutgoingVideoSource.h */,
 				07D6373E1BB0B11300256CE9 /* WebAudioSourceProviderAVFObjC.h */,
 				07D6373F1BB0B11300256CE9 /* WebAudioSourceProviderAVFObjC.mm */,
 			);
@@ -16373,6 +16377,8 @@
 				A56C5B99189F34570082D13C /* WebConsoleAgent.h */,
 				A5E616711894581F009ADF50 /* WebDebuggerAgent.cpp */,
 				A5E616721894581F009ADF50 /* WebDebuggerAgent.h */,
+				A5E212391E49249200CE1044 /* WebHeapAgent.cpp */,
+				A5E2123A1E49249200CE1044 /* WebHeapAgent.h */,
 				A5840E22187B8AC200843B10 /* WebInjectedScriptHost.cpp */,
 				A5840E23187B8AC200843B10 /* WebInjectedScriptHost.h */,
 				A584FE2D1864CB8400843B10 /* WebInjectedScriptManager.cpp */,
@@ -16659,11 +16665,11 @@
 			children = (
 				316FE1070E6E1DA700BF6088 /* AnimationBase.cpp */,
 				316FE1080E6E1DA700BF6088 /* AnimationBase.h */,
+				316FE10B0E6E1DA700BF6088 /* CompositeAnimation.cpp */,
+				316FE10C0E6E1DA700BF6088 /* CompositeAnimation.h */,
 				316FE1090E6E1DA700BF6088 /* CSSAnimationController.cpp */,
 				316FE10A0E6E1DA700BF6088 /* CSSAnimationController.h */,
 				0F15DA890F3AAEE70000CE47 /* CSSAnimationControllerPrivate.h */,
-				316FE10B0E6E1DA700BF6088 /* CompositeAnimation.cpp */,
-				316FE10C0E6E1DA700BF6088 /* CompositeAnimation.h */,
 				78D02BC3154A18DF00B62D05 /* CSSPropertyAnimation.cpp */,
 				78D02BC4154A18DF00B62D05 /* CSSPropertyAnimation.h */,
 				316FE10D0E6E1DA700BF6088 /* ImplicitAnimation.cpp */,
@@ -17050,9 +17056,9 @@
 			isa = PBXGroup;
 			children = (
 				443F04260E75C8FB007E5407 /* NetworkStateNotifierIOS.mm */,
-				A10DBF4618F92317000D70C6 /* QuickLookHandleClient.h */,
 				A1C150781E3F2B3E0032C98C /* PreviewConverter.h */,
 				A1C150771E3F2B3E0032C98C /* PreviewConverter.mm */,
+				A10DBF4618F92317000D70C6 /* QuickLookHandleClient.h */,
 				7E428CE413E3407F003B661C /* ResourceHandleIOS.mm */,
 				7E7DE201195CEFCD0035363B /* ResourceRequestIOS.mm */,
 				44A20DB80F84166C00B3E1FE /* WebCoreURLResponseIOS.h */,
@@ -20030,8 +20036,8 @@
 				F482230E1E3869B80066FC79 /* WebItemProviderPasteboard.mm */,
 				CDA29A2E1CBF73FC00901CCF /* WebPlaybackSessionInterfaceAVKit.h */,
 				CDA29A2F1CBF73FC00901CCF /* WebPlaybackSessionInterfaceAVKit.mm */,
+				1F8756B11E22BEEF0042C40D /* WebSQLiteDatabaseTrackerClient.h */,
 				1F8756B01E22BEEF0042C40D /* WebSQLiteDatabaseTrackerClient.mm */,
-				1F8756B11E22BEEF0042C40D /* WebSQLiteDatabaseTrackerClient.h */,
 				3F42B31B1881191B00278AAC /* WebVideoFullscreenControllerAVKit.h */,
 				3F42B31C1881191B00278AAC /* WebVideoFullscreenControllerAVKit.mm */,
 				3FBC4AF2189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.h */,
@@ -22293,7 +22299,6 @@
 				BC53DA2D1143121E000D817E /* DOMWrapperWorld.h */,
 				1432E8480C51493F00B1500F /* GCController.cpp */,
 				1432E8460C51493800B1500F /* GCController.h */,
-				709A01FD1E3D0BCC006B0D4C /* ModuleFetchFailureKind.h */,
 				C585A66011D4FAC5004C3E4B /* IDBBindingUtilities.cpp */,
 				C585A66111D4FAC5004C3E4B /* IDBBindingUtilities.h */,
 				E157A8EE18185425009F821D /* JSCryptoAlgorithmBuilder.cpp */,
@@ -22348,6 +22353,7 @@
 				4129DF841BB5B7F700322A16 /* JSReadableStreamPrivateConstructors.h */,
 				E1C36D320EB0A094007410BC /* JSWorkerGlobalScopeBase.cpp */,
 				E1C36D330EB0A094007410BC /* JSWorkerGlobalScopeBase.h */,
+				709A01FD1E3D0BCC006B0D4C /* ModuleFetchFailureKind.h */,
 				418C395E1C8F0AAB0051C8A3 /* ReadableStreamDefaultController.cpp */,
 				418C395F1C8F0AAB0051C8A3 /* ReadableStreamDefaultController.h */,
 				41F1D21E0EF35C2A00DA8753 /* ScriptCachedFrameData.cpp */,
@@ -24982,10 +24988,6 @@
 		FD3160B012B0270700C1A359 /* mac */ = {
 			isa = PBXGroup;
 			children = (
-				073B87621E43859D0071C0EC /* AudioSampleBufferList.cpp */,
-				073B87631E43859D0071C0EC /* AudioSampleBufferList.h */,
-				073B87641E43859D0071C0EC /* AudioSampleDataSource.cpp */,
-				073B87651E43859D0071C0EC /* AudioSampleDataSource.h */,
 				FD3160B512B0272A00C1A359 /* AudioBusMac.mm */,
 				FD3160B612B0272A00C1A359 /* AudioDestinationMac.cpp */,
 				FD3160B712B0272A00C1A359 /* AudioDestinationMac.h */,
@@ -24993,11 +24995,15 @@
 				FD3160B912B0272A00C1A359 /* AudioFileReaderMac.h */,
 				CD2F4A2518D8A3490063746D /* AudioHardwareListenerMac.cpp */,
 				CD2F4A2618D8A3490063746D /* AudioHardwareListenerMac.h */,
+				073B87621E43859D0071C0EC /* AudioSampleBufferList.cpp */,
+				073B87631E43859D0071C0EC /* AudioSampleBufferList.h */,
+				073B87641E43859D0071C0EC /* AudioSampleDataSource.cpp */,
+				073B87651E43859D0071C0EC /* AudioSampleDataSource.h */,
 				CD54DE4917469C6D005E5B36 /* AudioSessionMac.cpp */,
+				073B87571E40DCFD0071C0EC /* CAAudioStreamDescription.cpp */,
+				073B87581E40DCFD0071C0EC /* CAAudioStreamDescription.h */,
 				CDC734121977896C0046BFC5 /* CARingBuffer.cpp */,
 				CDC734131977896C0046BFC5 /* CARingBuffer.h */,
-				073B87571E40DCFD0071C0EC /* CAAudioStreamDescription.cpp */,
-				073B87581E40DCFD0071C0EC /* CAAudioStreamDescription.h */,
 				FD3160BA12B0272A00C1A359 /* FFTFrameMac.cpp */,
 				CD669D671D232E10004D1866 /* MediaSessionManagerMac.h */,
 				07EDC3ED1AACB75D00983EB5 /* MediaSessionManagerMac.mm */,
@@ -25168,8 +25174,6 @@
 				490707E71219C04300D90E51 /* ANGLEWebKitBridge.h in Headers */,
 				49E912AB0EFAC906009D0CAF /* Animation.h in Headers */,
 				316FE1120E6E1DA700BF6088 /* AnimationBase.h in Headers */,
-				316FE1140E6E1DA700BF6088 /* CSSAnimationController.h in Headers */,
-				0F15DA8A0F3AAEE70000CE47 /* CSSAnimationControllerPrivate.h in Headers */,
 				319848011A1D817B00A13318 /* AnimationEvent.h in Headers */,
 				49E912AD0EFAC906009D0CAF /* AnimationList.h in Headers */,
 				31DCD29D1AB4FBDE0072E817 /* AnimationTrigger.h in Headers */,
@@ -25236,6 +25240,8 @@
 				FD31608412B026F700C1A359 /* AudioProcessor.h in Headers */,
 				FD31608612B026F700C1A359 /* AudioResampler.h in Headers */,
 				FD31608812B026F700C1A359 /* AudioResamplerKernel.h in Headers */,
+				073B87671E4385AC0071C0EC /* AudioSampleBufferList.h in Headers */,
+				073B87691E4385AC0071C0EC /* AudioSampleDataSource.h in Headers */,
 				FD8C46EC154608E700A5910C /* AudioScheduledSourceNode.h in Headers */,
 				CDA7982A170A3D0000D45C55 /* AudioSession.h in Headers */,
 				07707CB01E205EE300005BF7 /* AudioSourceObserverObjC.h in Headers */,
@@ -25242,6 +25248,7 @@
 				FD31608912B026F700C1A359 /* AudioSourceProvider.h in Headers */,
 				CD8A7BBC197735FE00CBD643 /* AudioSourceProviderAVFObjC.h in Headers */,
 				FD62F52E145898D80094B0ED /* AudioSourceProviderClient.h in Headers */,
+				07C046CB1E426413007201E7 /* AudioStreamDescription.h in Headers */,
 				FDB052E01561A42C00B500D6 /* AudioSummingJunction.h in Headers */,
 				BE88E0D91715D2A200658D98 /* AudioTrack.h in Headers */,
 				BE88E0DC1715D2A200658D98 /* AudioTrackList.h in Headers */,
@@ -25250,8 +25257,9 @@
 				CDE3A85417F5FCE600C5BE20 /* AudioTrackPrivateAVF.h in Headers */,
 				CDE3A85817F6020400C5BE20 /* AudioTrackPrivateAVFObjC.h in Headers */,
 				CD54A763180F9F7000B076C9 /* AudioTrackPrivateMediaSourceAVFObjC.h in Headers */,
+				07D6A4F81BF2307D00174146 /* AudioTrackPrivateMediaStream.h in Headers */,
 				07C046C81E425155007201E7 /* AudioTrackPrivateMediaStreamCocoa.h in Headers */,
-				07D6A4F81BF2307D00174146 /* AudioTrackPrivateMediaStream.h in Headers */,
+				07C046C81E425155007201E7 /* AudioTrackPrivateMediaStreamCocoa.h in Headers */,
 				FD31608B12B026F700C1A359 /* AudioUtilities.h in Headers */,
 				7EE6846012D26E3800E79415 /* AuthenticationCF.h in Headers */,
 				7EE6846112D26E3800E79415 /* AuthenticationChallenge.h in Headers */,
@@ -25325,6 +25333,7 @@
 				1A569CFA0D7E2B82007C3983 /* c_instance.h in Headers */,
 				1A569CFC0D7E2B82007C3983 /* c_runtime.h in Headers */,
 				1A569CFE0D7E2B82007C3983 /* c_utility.h in Headers */,
+				07C046C41E42508B007201E7 /* CAAudioStreamDescription.h in Headers */,
 				BCB16C1A0979C3BD00467741 /* CachedCSSStyleSheet.h in Headers */,
 				BC64B4CC0CB4295D005F2B62 /* CachedFont.h in Headers */,
 				1AEF4E67170E160300AB2799 /* CachedFontClient.h in Headers */,
@@ -25533,11 +25542,12 @@
 				E125F8361822F18A00D84CD9 /* CryptoKeyHMAC.h in Headers */,
 				E1F80B8818317252007885C3 /* CryptoKeyPair.h in Headers */,
 				E164FAA318315BF400DB4E61 /* CryptoKeyRSA.h in Headers */,
-				7C45C9D51E3FCBE400AAB558 /* JSDOMBindingCaller.h in Headers */,
 				E125F856182C0F8300D84CD9 /* CryptoKeySerialization.h in Headers */,
 				E125F85A182C1AA600D84CD9 /* CryptoKeySerializationRaw.h in Headers */,
 				E19727161820549E00592D51 /* CryptoKeyType.h in Headers */,
 				E172AF70180F289500FBADB9 /* CryptoKeyUsage.h in Headers */,
+				316FE1140E6E1DA700BF6088 /* CSSAnimationController.h in Headers */,
+				0F15DA8A0F3AAEE70000CE47 /* CSSAnimationControllerPrivate.h in Headers */,
 				31BC742E1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.h in Headers */,
 				CAE9F910146441F000C245B0 /* CSSAspectRatioValue.h in Headers */,
 				94DE5C821D7F3A1400164F2A /* CSSAtRuleID.h in Headers */,
@@ -25551,7 +25561,6 @@
 				2D8FEBDD143E3EF70072502B /* CSSCrossfadeValue.h in Headers */,
 				AA21ECCD0ABF0FC6002B834C /* CSSCursorImageValue.h in Headers */,
 				9444CBE41D8861990073A074 /* CSSCustomIdentValue.h in Headers */,
-				073B87691E4385AC0071C0EC /* AudioSampleDataSource.h in Headers */,
 				BC779E141BB215BB00CAA8BF /* CSSCustomPropertyValue.h in Headers */,
 				4A9CC81816BB9AC600EC645A /* CSSDefaultStyleSheets.h in Headers */,
 				94476BDB1DFCAC0300690E23 /* CSSDeferredParser.h in Headers */,
@@ -25725,7 +25734,6 @@
 				D0BD4F5D1408850F006839B6 /* DictationCommandIOS.h in Headers */,
 				937FF3D51A1012D6008EBA31 /* DictionaryLookup.h in Headers */,
 				2D5646B01B8F8493003C4994 /* DictionaryPopupInfo.h in Headers */,
-				1F36EA9C1E21BA1700621E25 /* WebBackgroundTaskController.h in Headers */,
 				FDAF19991513D131008DB0C3 /* DirectConvolver.h in Headers */,
 				7EDAAFC919A2CCDC0034DFD1 /* DiskCacheMonitorCocoa.h in Headers */,
 				0FE5FBD31C3DD51E0007A2CA /* DisplayList.h in Headers */,
@@ -25820,7 +25828,6 @@
 				4F1534DE11B532EC0021FD86 /* EditingBehavior.h in Headers */,
 				4F1534E011B533020021FD86 /* EditingBehaviorTypes.h in Headers */,
 				3AC648B2129E146500C3EB25 /* EditingBoundary.h in Headers */,
-				1F8756B21E22C3350042C40D /* WebSQLiteDatabaseTrackerClient.h in Headers */,
 				9BAB6C6C12550631001626D4 /* EditingStyle.h in Headers */,
 				4B3043CD0AE0373B00A82647 /* Editor.h in Headers */,
 				1AF326790D78B9440068F0C4 /* EditorClient.h in Headers */,
@@ -26094,7 +26101,6 @@
 				A81369D0097374F600D74463 /* HTMLFormElement.h in Headers */,
 				A871DE2B0A152AC800B12A68 /* HTMLFrameElement.h in Headers */,
 				14FFE31D0AE1963300136BF5 /* HTMLFrameElementBase.h in Headers */,
-				709A01FE1E3D0BDD006B0D4C /* ModuleFetchFailureKind.h in Headers */,
 				93E241FF0B2B4E4000C732A1 /* HTMLFrameOwnerElement.h in Headers */,
 				A871DE280A152AC800B12A68 /* HTMLFrameSetElement.h in Headers */,
 				A871DE2D0A152AC800B12A68 /* HTMLHeadElement.h in Headers */,
@@ -26337,7 +26343,6 @@
 				0F8B45721DC3FBA300443C3F /* IntersectionObserverCallback.h in Headers */,
 				0F4710DF1DB6FE22002DCEC3 /* IntersectionObserverEntry.h in Headers */,
 				B27535720B053814002CE64F /* IntPoint.h in Headers */,
-				415080371E3F00B00051D75D /* LibWebRTCAudioModule.h in Headers */,
 				E462A4A1113E71BE004A4220 /* IntPointHash.h in Headers */,
 				B27535740B053814002CE64F /* IntRect.h in Headers */,
 				A2B9217316C5CC420041DCD9 /* IntRectExtent.h in Headers */,
@@ -26462,11 +26467,14 @@
 				65DF31F609D1CC60000BE325 /* JSDocumentType.h in Headers */,
 				1AC2260D0DB69F190089B669 /* JSDOMApplicationCache.h in Headers */,
 				93B70D6409EB0C7C009D8468 /* JSDOMBinding.h in Headers */,
+				7C45C9D51E3FCBE400AAB558 /* JSDOMBindingCaller.h in Headers */,
+				7C45C9D41E3FCBDF00AAB558 /* JSDOMBindingSecurity.h in Headers */,
 				413C2C341BC29A8F0075204C /* JSDOMConstructor.h in Headers */,
 				930841341CDDB15500B0958C /* JSDOMConvert.h in Headers */,
 				BC60D7C10D29A46300B9918F /* JSDOMCoreException.h in Headers */,
 				FC9E0E4D16419C1E00392BE3 /* JSDOMCSSNamespace.h in Headers */,
 				40ECAE7E16B8B67200C36103 /* JSDOMError.h in Headers */,
+				7C45C9D61E3FCBF800AAB558 /* JSDOMExceptionHandling.h in Headers */,
 				2E0888D51148848A00AF4265 /* JSDOMFormData.h in Headers */,
 				E1C36C030EB076D6007410BC /* JSDOMGlobalObject.h in Headers */,
 				7C2BDD3E17C7F98C0038FF15 /* JSDOMGlobalObjectTask.h in Headers */,
@@ -26496,6 +26504,7 @@
 				460CBF361D4BCD0E0092E88E /* JSDOMWindowProperties.h in Headers */,
 				BCBFB53D0DCD29CF0019B3E5 /* JSDOMWindowShell.h in Headers */,
 				65E0E9441133C89F00B4CB10 /* JSDOMWrapper.h in Headers */,
+				7C45C9D31E3FCBD700AAB558 /* JSDOMWrapperCache.h in Headers */,
 				93A8061E1E03B585008A1F26 /* JSDoubleRange.h in Headers */,
 				E318039D1DC40099009932C2 /* JSDynamicDowncast.h in Headers */,
 				FD7868BA136B999200D403DF /* JSDynamicsCompressorNode.h in Headers */,
@@ -26672,7 +26681,6 @@
 				E107400E0E77BDC00033AF24 /* JSMessageChannel.h in Headers */,
 				75793EC90D0CE72D007FC0AC /* JSMessageEvent.h in Headers */,
 				E1ADEDDA0E76BD93004A1A5E /* JSMessagePort.h in Headers */,
-				07C046CB1E426413007201E7 /* AudioStreamDescription.h in Headers */,
 				CDF4B7301E03CA4A00E235A2 /* JSMockCDMFactory.h in Headers */,
 				2D6F3E951C1F85550061DBD4 /* JSMockPageOverlay.h in Headers */,
 				A86629D109DA2B48009633A5 /* JSMouseEvent.h in Headers */,
@@ -26733,7 +26741,6 @@
 				6C4C96DF1AD4483500363F64 /* JSReadableByteStreamController.h in Headers */,
 				7C4C96DD1AD4483500365A50 /* JSReadableStream.h in Headers */,
 				6C4C96DF1AD4483500365A50 /* JSReadableStreamDefaultController.h in Headers */,
-				073B87671E4385AC0071C0EC /* AudioSampleBufferList.h in Headers */,
 				7C4C96DF1AD4483500365A50 /* JSReadableStreamDefaultReader.h in Headers */,
 				4129DF861BB5B80C00322A16 /* JSReadableStreamPrivateConstructors.h in Headers */,
 				7E4C96DD1AD4483500365A51 /* JSReadableStreamSource.h in Headers */,
@@ -26873,7 +26880,6 @@
 				4496E3A0139813A5003EE32A /* JSSVGMPathElement.h in Headers */,
 				8542A7970AE5C94300DF58DF /* JSSVGNumber.h in Headers */,
 				B2FA3DB10AB75A6F000E5AC4 /* JSSVGNumberList.h in Headers */,
-				7C45C9D31E3FCBD700AAB558 /* JSDOMWrapperCache.h in Headers */,
 				B2FA3DB50AB75A6F000E5AC4 /* JSSVGPathElement.h in Headers */,
 				B2FA3DB70AB75A6F000E5AC4 /* JSSVGPathSeg.h in Headers */,
 				B2FA3DB90AB75A6F000E5AC4 /* JSSVGPathSegArcAbs.h in Headers */,
@@ -27054,6 +27060,7 @@
 				E5BA7D63151437CA00FE1E3F /* LengthFunctions.h in Headers */,
 				0F8716701C869D83004FF0DE /* LengthPoint.h in Headers */,
 				BCFF64920EAD15C200C1D6F7 /* LengthSize.h in Headers */,
+				415080371E3F00B00051D75D /* LibWebRTCAudioModule.h in Headers */,
 				415747471E3869A400E914D8 /* LibWebRTCMacros.h in Headers */,
 				417612B01E3A994000C3D81D /* LibWebRTCMediaEndpoint.h in Headers */,
 				417612B21E3A994000C3D81D /* LibWebRTCPeerConnectionBackend.h in Headers */,
@@ -27252,6 +27259,7 @@
 				CDF2B0171820540700F2B424 /* MockSourceBufferPrivate.h in Headers */,
 				CDF2B0191820540700F2B424 /* MockTracks.h in Headers */,
 				C6D74AD509AA282E000B0A52 /* ModifySelectionListLevel.h in Headers */,
+				709A01FE1E3D0BDD006B0D4C /* ModuleFetchFailureKind.h in Headers */,
 				F55B3DC61251F12D003EF269 /* MonthInputType.h in Headers */,
 				85031B460A44EFC700F992E0 /* MouseEvent.h in Headers */,
 				83765F951DAC522F00C06537 /* MouseEventInit.h in Headers */,
@@ -27510,6 +27518,7 @@
 				9746AF3214F4DDE6003E7A70 /* PositionOptions.h in Headers */,
 				46DBB6501AB8C96F00D9A813 /* PowerObserverMac.h in Headers */,
 				C0F2A44113869AAB0066C534 /* preprocessor.pm in Headers */,
+				A1C1507A1E3F2B3E0032C98C /* PreviewConverter.h in Headers */,
 				B71FE6DF11091CB300DAEF77 /* PrintContext.h in Headers */,
 				A8EA7EBC0A1945D000A8EF5F /* ProcessingInstruction.h in Headers */,
 				E44613EC0CD681B500FADA75 /* ProgressEvent.h in Headers */,
@@ -27798,7 +27807,6 @@
 				A79BADA4161E7F3F00C2E652 /* RuleSet.h in Headers */,
 				2D76BB821945632400CFD29A /* RunLoopObserver.h in Headers */,
 				1A569D1F0D7E2B82007C3983 /* runtime_array.h in Headers */,
-				07C046C41E42508B007201E7 /* CAAudioStreamDescription.h in Headers */,
 				1A569D210D7E2B82007C3983 /* runtime_method.h in Headers */,
 				1A569D230D7E2B82007C3983 /* runtime_object.h in Headers */,
 				1A569D250D7E2B82007C3983 /* runtime_root.h in Headers */,
@@ -27864,7 +27872,6 @@
 				1AAADDE414DC8C8F00AF64B3 /* ScrollingTreeNode.h in Headers */,
 				0FEA3E80191B3169000F1B55 /* ScrollingTreeOverflowScrollingNode.h in Headers */,
 				9391A99D1629D70000297330 /* ScrollingTreeScrollingNode.h in Headers */,
-				07C046C81E425155007201E7 /* AudioTrackPrivateMediaStreamCocoa.h in Headers */,
 				0FB8890A167D2FA10010CDA5 /* ScrollingTreeStickyNode.h in Headers */,
 				7AAFE8D019CB8672000F56D8 /* ScrollLatchingState.h in Headers */,
 				F478755419983AFF0024A287 /* ScrollSnapAnimatorState.h in Headers */,
@@ -27987,7 +27994,6 @@
 				97BC6A521505F081001B74AC /* SQLTransactionCallback.h in Headers */,
 				97BC6A571505F081001B74AC /* SQLTransactionCoordinator.h in Headers */,
 				97BC6A581505F081001B74AC /* SQLTransactionErrorCallback.h in Headers */,
-				7C45C9D41E3FCBDF00AAB558 /* JSDOMBindingSecurity.h in Headers */,
 				FE36FD1816C7826500F887C1 /* SQLTransactionState.h in Headers */,
 				FE36FD1716C7826500F887C1 /* SQLTransactionStateMachine.h in Headers */,
 				1A2E6E5A0CC55213004A2062 /* SQLValue.h in Headers */,
@@ -28036,7 +28042,6 @@
 				0FF50272102BA96A0066F39A /* StyleMedia.h in Headers */,
 				BC5EB74E0E81E06700B25965 /* StyleMultiColData.h in Headers */,
 				E4DACE6A1D12E10B0075980F /* StylePendingResources.h in Headers */,
-				7C45C9D61E3FCBF800AAB558 /* JSDOMExceptionHandling.h in Headers */,
 				A80E6DFC0A199067007FB8C5 /* StyleProperties.h in Headers */,
 				E1B25107152A0BB00069B779 /* StylePropertyShorthand.h in Headers */,
 				83C05A5B1A686212007E5DEA /* StylePropertyShorthandFunctions.h in Headers */,
@@ -28527,6 +28532,7 @@
 				AA478A7F16CD70C3007D1BB4 /* WebAccessibilityObjectWrapperMac.h in Headers */,
 				2D3EF4481917915C00034184 /* WebActionDisablingCALayerDelegate.h in Headers */,
 				07D637401BB0B11300256CE9 /* WebAudioSourceProviderAVFObjC.h in Headers */,
+				1F36EA9C1E21BA1700621E25 /* WebBackgroundTaskController.h in Headers */,
 				A56C5B9B189F34570082D13C /* WebConsoleAgent.h in Headers */,
 				419BE7591BC7F42B00E1C85B /* WebCoreBuiltinNames.h in Headers */,
 				2D3EF44A1917915C00034184 /* WebCoreCALayerExtras.h in Headers */,
@@ -28600,6 +28606,7 @@
 				0C3F1F5B10C8871200D72CE1 /* WebGLUniformLocation.h in Headers */,
 				6F995A261A7078B100A735F4 /* WebGLVertexArrayObject.h in Headers */,
 				77A17A7812F28642004E02F6 /* WebGLVertexArrayObjectOES.h in Headers */,
+				A5E2123C1E4924A400CE1044 /* WebHeapAgent.h in Headers */,
 				A5840E25187B8AC200843B10 /* WebInjectedScriptHost.h in Headers */,
 				A584FE301864CB8400843B10 /* WebInjectedScriptManager.h in Headers */,
 				F48223111E3869B80066FC79 /* WebItemProviderPasteboard.h in Headers */,
@@ -28642,6 +28649,7 @@
 				97AABD2414FA09D5007457AE /* WebSocketExtensionProcessor.h in Headers */,
 				97AABD2514FA09D5007457AE /* WebSocketFrame.h in Headers */,
 				97AABD2714FA09D5007457AE /* WebSocketHandshake.h in Headers */,
+				1F8756B21E22C3350042C40D /* WebSQLiteDatabaseTrackerClient.h in Headers */,
 				31DEA4561B39F4D900F77178 /* WebSystemBackdropLayer.h in Headers */,
 				0F580FA31496939100FB5BD8 /* WebTiledBackingLayer.h in Headers */,
 				52B0D4C01C57FD660077CE53 /* WebVideoFullscreenChangeObserver.h in Headers */,
@@ -28744,7 +28752,6 @@
 				93F199EC08245E59001E9ABC /* XSLStyleSheet.h in Headers */,
 				E1F1E8300C3C2BB9006DB391 /* XSLTExtensions.h in Headers */,
 				93F199ED08245E59001E9ABC /* XSLTProcessor.h in Headers */,
-				A1C1507A1E3F2B3E0032C98C /* PreviewConverter.h in Headers */,
 				E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
 				977E2E0F12F0FC9C00C13379 /* XSSAuditor.h in Headers */,
 				977E2E0F12F0FC9C00C13380 /* XSSAuditorDelegate.h in Headers */,
@@ -29132,7 +29139,6 @@
 				490707E61219C04300D90E51 /* ANGLEWebKitBridge.cpp in Sources */,
 				49E912AA0EFAC906009D0CAF /* Animation.cpp in Sources */,
 				316FE1110E6E1DA700BF6088 /* AnimationBase.cpp in Sources */,
-				316FE1130E6E1DA700BF6088 /* CSSAnimationController.cpp in Sources */,
 				120DE3F11C86CCC600B6D4DD /* AnimationEffect.cpp in Sources */,
 				319848021A1D818100A13318 /* AnimationEvent.cpp in Sources */,
 				49E912AC0EFAC906009D0CAF /* AnimationList.cpp in Sources */,
@@ -29185,6 +29191,8 @@
 				FD31601F12B0267600C1A359 /* AudioProcessingEvent.cpp in Sources */,
 				FD31608512B026F700C1A359 /* AudioResampler.cpp in Sources */,
 				FD31608712B026F700C1A359 /* AudioResamplerKernel.cpp in Sources */,
+				073B87661E4385AC0071C0EC /* AudioSampleBufferList.cpp in Sources */,
+				073B87681E4385AC0071C0EC /* AudioSampleDataSource.cpp in Sources */,
 				FD8C46EB154608E700A5910C /* AudioScheduledSourceNode.cpp in Sources */,
 				CDA79824170A258300D45C55 /* AudioSession.cpp in Sources */,
 				CDA79827170A279100D45C55 /* AudioSessionIOS.mm in Sources */,
@@ -29195,6 +29203,7 @@
 				BE88E0DB1715D2A200658D98 /* AudioTrackList.cpp in Sources */,
 				CDE3A85717F6020400C5BE20 /* AudioTrackPrivateAVFObjC.mm in Sources */,
 				CD54A762180F9F7000B076C9 /* AudioTrackPrivateMediaSourceAVFObjC.cpp in Sources */,
+				076EC1331E44F56D00E5D813 /* AudioTrackPrivateMediaStreamCocoa.cpp in Sources */,
 				FD31608A12B026F700C1A359 /* AudioUtilities.cpp in Sources */,
 				7EE6845F12D26E3800E79415 /* AuthenticationCF.cpp in Sources */,
 				934F71380D5A6EFF00018D69 /* AuthenticationChallengeBase.cpp in Sources */,
@@ -29255,6 +29264,7 @@
 				1A569CF90D7E2B82007C3983 /* c_instance.cpp in Sources */,
 				1A569CFB0D7E2B82007C3983 /* c_runtime.cpp in Sources */,
 				1A569CFD0D7E2B82007C3983 /* c_utility.cpp in Sources */,
+				07C046C31E42508B007201E7 /* CAAudioStreamDescription.cpp in Sources */,
 				BCB16C190979C3BD00467741 /* CachedCSSStyleSheet.cpp in Sources */,
 				BC64B4CB0CB4295D005F2B62 /* CachedFont.cpp in Sources */,
 				51C0AA410F2AA15E001648C2 /* CachedFrame.cpp in Sources */,
@@ -29416,6 +29426,7 @@
 				57E2336B1DCC262400F28D01 /* CryptoKeyRSA.cpp in Sources */,
 				E164FAA518315E1A00DB4E61 /* CryptoKeyRSAMac.cpp in Sources */,
 				E125F859182C1AA600D84CD9 /* CryptoKeySerializationRaw.cpp in Sources */,
+				316FE1130E6E1DA700BF6088 /* CSSAnimationController.cpp in Sources */,
 				31BC742D1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.cpp in Sources */,
 				CAE9F90F146441F000C245B0 /* CSSAspectRatioValue.cpp in Sources */,
 				94DE5C811D7F3A1400164F2A /* CSSAtRuleID.cpp in Sources */,
@@ -29435,7 +29446,6 @@
 				FBB0C5B717BBD626003D3677 /* CSSFilterImageValue.cpp in Sources */,
 				BC64B4D50CB4298A005F2B62 /* CSSFontFace.cpp in Sources */,
 				409EBDB216B7EE7400CBA3FC /* CSSFontFaceLoadEvent.cpp in Sources */,
-				7C45C9D11E3EFE0500AAB558 /* JSDOMConstructor.cpp in Sources */,
 				A80E6CE70A1989CA007FB8C5 /* CSSFontFaceRule.cpp in Sources */,
 				C26017A31C72DC9900F74A16 /* CSSFontFaceSet.cpp in Sources */,
 				BC64B4D70CB4298A005F2B62 /* CSSFontFaceSource.cpp in Sources */,
@@ -29537,7 +29547,6 @@
 				0F6A12BD1A00923700C6DE72 /* DebugPageOverlays.cpp in Sources */,
 				45FEA5CF156DDE8C00654101 /* Decimal.cpp in Sources */,
 				A8C228A211D5722E00D5A7D3 /* DecodedDataDocumentParser.cpp in Sources */,
-				A1C150791E3F2B3E0032C98C /* PreviewConverter.mm in Sources */,
 				4162A450101145AE00DFF3ED /* DedicatedWorkerGlobalScope.cpp in Sources */,
 				41A3D58E101C152D00316D07 /* DedicatedWorkerThread.cpp in Sources */,
 				FD06DFA5134A4DEF006F5D7D /* DefaultAudioDestinationNode.cpp in Sources */,
@@ -29767,7 +29776,6 @@
 				B2AFFC7C0D00A5C10030074D /* FontCacheMac.mm in Sources */,
 				B2C3DA600D006CD600EF6F26 /* FontCascade.cpp in Sources */,
 				B2AFFC800D00A5C10030074D /* FontCascadeCocoa.mm in Sources */,
-				7C45C9D01E3EFDFB00AAB558 /* JSDOMWrapperCache.cpp in Sources */,
 				B2C3DA670D006CD600EF6F26 /* FontCascadeFonts.cpp in Sources */,
 				7C4EDD741A7B607800198C4D /* FontCocoa.mm in Sources */,
 				B2AFFC7D0D00A5C10030074D /* FontCustomPlatformData.cpp in Sources */,
@@ -30004,7 +30012,6 @@
 				51F798EF1BE880E7008AE491 /* IDBIndexInfo.cpp in Sources */,
 				51E269361DD3BD97006B6A58 /* IDBIterateCursorData.cpp in Sources */,
 				5185FC941BB4C4E80012898F /* IDBKey.cpp in Sources */,
-				073B87661E4385AC0071C0EC /* AudioSampleBufferList.cpp in Sources */,
 				5185FC961BB4C4E80012898F /* IDBKeyData.cpp in Sources */,
 				5185FC981BB4C4E80012898F /* IDBKeyPath.cpp in Sources */,
 				5185FC9A1BB4C4E80012898F /* IDBKeyRange.cpp in Sources */,
@@ -30013,7 +30020,6 @@
 				5160712E1BD8307800DBC4F2 /* IDBObjectStoreInfo.cpp in Sources */,
 				5185FCA31BB4C4E80012898F /* IDBOpenDBRequest.cpp in Sources */,
 				5185FCA81BB4C4E80012898F /* IDBRequest.cpp in Sources */,
-				073B87681E4385AC0071C0EC /* AudioSampleDataSource.cpp in Sources */,
 				514129981C6976900059E714 /* IDBRequestCompletionEvent.cpp in Sources */,
 				510A58F91BACC7F200C19282 /* IDBRequestData.cpp in Sources */,
 				5145B1091BC48E2E00E86219 /* IDBResourceIdentifier.cpp in Sources */,
@@ -30221,7 +30227,6 @@
 				BC20FB7F0C0E8E6C00D1447F /* JSCSSValueCustom.cpp in Sources */,
 				9BD4E9161C462872005065BC /* JSCustomElementInterface.cpp in Sources */,
 				9BE6710B1D5AEB2100345514 /* JSCustomElementRegistry.cpp in Sources */,
-				5CDD833D1E4324D900621E92 /* RealtimeOutgoingVideoSource.cpp in Sources */,
 				9BC5F9E01D5AAF6B002B749D /* JSCustomElementRegistryCustom.cpp in Sources */,
 				E4778B7F115A581A00B5D372 /* JSCustomEvent.cpp in Sources */,
 				DEC297611B4F2F8D005F5945 /* JSCustomEventCustom.cpp in Sources */,
@@ -30250,9 +30255,12 @@
 				65DF31F509D1CC60000BE325 /* JSDocumentType.cpp in Sources */,
 				1AC2260C0DB69F190089B669 /* JSDOMApplicationCache.cpp in Sources */,
 				93B70D6309EB0C7C009D8468 /* JSDOMBinding.cpp in Sources */,
+				7C45C9CF1E3EFDF700AAB558 /* JSDOMBindingSecurity.cpp in Sources */,
+				7C45C9D11E3EFE0500AAB558 /* JSDOMConstructor.cpp in Sources */,
 				BC60D7C00D29A46300B9918F /* JSDOMCoreException.cpp in Sources */,
 				FD67773B195CB1E60072E0D3 /* JSDOMCSSNamespace.cpp in Sources */,
 				40ECAE8116B8B68A00C36103 /* JSDOMError.cpp in Sources */,
+				7C45C9D21E3EFE0800AAB558 /* JSDOMExceptionHandling.cpp in Sources */,
 				2E0888D41148848A00AF4265 /* JSDOMFormData.cpp in Sources */,
 				E1C36CBD0EB08062007410BC /* JSDOMGlobalObject.cpp in Sources */,
 				7C2BDD3D17C7F98C0038FF15 /* JSDOMGlobalObjectTask.cpp in Sources */,
@@ -30285,6 +30293,7 @@
 				BCBFB53C0DCD29CF0019B3E5 /* JSDOMWindowShell.cpp in Sources */,
 				A1CC11641E493D0100EFA69C /* FileSystemMac.mm in Sources */,
 				4170A2EA1D8C0CCA00318452 /* JSDOMWrapper.cpp in Sources */,
+				7C45C9D01E3EFDFB00AAB558 /* JSDOMWrapperCache.cpp in Sources */,
 				93A8061D1E03B585008A1F26 /* JSDoubleRange.cpp in Sources */,
 				FD7868B9136B999200D403DF /* JSDynamicsCompressorNode.cpp in Sources */,
 				65DF31F909D1CC60000BE325 /* JSElement.cpp in Sources */,
@@ -30722,7 +30731,6 @@
 				B2FA3DD80AB75A6F000E5AC4 /* JSSVGPathSegLinetoVerticalRel.cpp in Sources */,
 				B2FA3DDA0AB75A6F000E5AC4 /* JSSVGPathSegList.cpp in Sources */,
 				B2FA3DDC0AB75A6F000E5AC4 /* JSSVGPathSegMovetoAbs.cpp in Sources */,
-				1F36EA9D1E21BA1700621E25 /* WebBackgroundTaskController.mm in Sources */,
 				B2FA3DDE0AB75A6F000E5AC4 /* JSSVGPathSegMovetoRel.cpp in Sources */,
 				B2FA3DE00AB75A6F000E5AC4 /* JSSVGPatternElement.cpp in Sources */,
 				8542A7960AE5C94200DF58DF /* JSSVGPoint.cpp in Sources */,
@@ -30731,7 +30739,6 @@
 				B2FA3DE70AB75A6F000E5AC4 /* JSSVGPolylineElement.cpp in Sources */,
 				B2FA3DE90AB75A6F000E5AC4 /* JSSVGPreserveAspectRatio.cpp in Sources */,
 				B2FA3DEB0AB75A6F000E5AC4 /* JSSVGRadialGradientElement.cpp in Sources */,
-				5CDD833E1E4324DC00621E92 /* RealtimeIncomingVideoSource.cpp in Sources */,
 				8542A7940AE5C94000DF58DF /* JSSVGRect.cpp in Sources */,
 				B2FA3DED0AB75A6F000E5AC4 /* JSSVGRectElement.cpp in Sources */,
 				B2FA3DF00AB75A6F000E5AC4 /* JSSVGRenderingIntent.cpp in Sources */,
@@ -30878,7 +30885,6 @@
 				517A63C41B74318B00E7DCDC /* KeyedEncoderCF.cpp in Sources */,
 				A513B3D8114B166A001C429B /* KeyEventCocoa.mm in Sources */,
 				2655413A1489811C000DFC5D /* KeyEventIOS.mm in Sources */,
-				07C046C31E42508B007201E7 /* CAAudioStreamDescription.cpp in Sources */,
 				935C477009AC4D7300A6AAB4 /* KeyEventMac.mm in Sources */,
 				316FE1190E6E1DA700BF6088 /* KeyframeAnimation.cpp in Sources */,
 				12A253DB1C8FF7DC00C22295 /* KeyframeEffect.cpp in Sources */,
@@ -30912,6 +30918,8 @@
 				E55F497A151B888000BB67DB /* LengthFunctions.cpp in Sources */,
 				0F87166F1C869D83004FF0DE /* LengthPoint.cpp in Sources */,
 				0FEF20CE1BD4A24100128E5D /* LengthSize.cpp in Sources */,
+				415080361E3F00AD0051D75D /* LibWebRTCAudioModule.cpp in Sources */,
+				5CDD83641E4325A000621E92 /* LibWebRTCDataChannelHandler.cpp in Sources */,
 				417612AF1E3A994000C3D81D /* LibWebRTCMediaEndpoint.cpp in Sources */,
 				417612B11E3A994000C3D81D /* LibWebRTCPeerConnectionBackend.cpp in Sources */,
 				415747491E3869AA00E914D8 /* LibWebRTCUtils.cpp in Sources */,
@@ -31254,6 +31262,7 @@
 				93F19AF808245E59001E9ABC /* Position.cpp in Sources */,
 				37919C230B7D188600A56998 /* PositionIterator.cpp in Sources */,
 				4634592C1AC2271000ECB71C /* PowerObserverMac.cpp in Sources */,
+				A1C150791E3F2B3E0032C98C /* PreviewConverter.mm in Sources */,
 				B776D43D1104527500BEB0EC /* PrintContext.cpp in Sources */,
 				A8EA7EBD0A1945D000A8EF5F /* ProcessingInstruction.cpp in Sources */,
 				E44613EB0CD681B400FADA75 /* ProgressEvent.cpp in Sources */,
@@ -31282,6 +31291,7 @@
 				418C39611C8F0AB10051C8A3 /* ReadableStreamDefaultController.cpp in Sources */,
 				FD31603B12B0267600C1A359 /* RealtimeAnalyser.cpp in Sources */,
 				41103AAE1E39791000769F03 /* RealtimeIncomingAudioSource.cpp in Sources */,
+				5CDD833E1E4324DC00621E92 /* RealtimeIncomingVideoSource.cpp in Sources */,
 				4A4F65701AA997F100E38CDD /* RealtimeMediaSource.cpp in Sources */,
 				4A0FFAA11AAF5EA20062803B /* RealtimeMediaSourceCenter.cpp in Sources */,
 				4A0FFAA51AAF5EF60062803B /* RealtimeMediaSourceCenterMac.cpp in Sources */,
@@ -31288,6 +31298,7 @@
 				4A4F65731AA997F100E38CDD /* RealtimeMediaSourceSettings.cpp in Sources */,
 				2EC41DE41C0410A300D294FE /* RealtimeMediaSourceSupportedConstraints.cpp in Sources */,
 				41103AAB1E39791000769F03 /* RealtimeOutgoingAudioSource.cpp in Sources */,
+				5CDD833D1E4324D900621E92 /* RealtimeOutgoingVideoSource.cpp in Sources */,
 				FD45A95A175D417100C21EC8 /* RectangleShape.cpp in Sources */,
 				BCAB418113E356E800D8AAF3 /* Region.cpp in Sources */,
 				CDFC360518CA61C20026E56F /* RemoteCommandListener.cpp in Sources */,
@@ -31314,7 +31325,6 @@
 				A8EA73C30A1900E300A8EF5F /* RenderFieldset.cpp in Sources */,
 				066C77300AB603FD00238CC4 /* RenderFileUploadControl.cpp in Sources */,
 				53C8298D13D8D92700DE2DEB /* RenderFlexibleBox.cpp in Sources */,
-				5CDD83641E4325A000621E92 /* LibWebRTCDataChannelHandler.cpp in Sources */,
 				508CCA5013CF106B003151F3 /* RenderFlowThread.cpp in Sources */,
 				A871DED40A1530C700B12A68 /* RenderFrame.cpp in Sources */,
 				0FD3080E117CF7E700A791F7 /* RenderFrameBase.cpp in Sources */,
@@ -31753,7 +31763,6 @@
 				B22279A40D00BF220071B782 /* SVGComponentTransferFunctionElement.cpp in Sources */,
 				B2227B050D00BFF10071B782 /* SVGCSSComputedStyleDeclaration.cpp in Sources */,
 				B22279A70D00BF220071B782 /* SVGCursorElement.cpp in Sources */,
-				7C45C9D21E3EFE0800AAB558 /* JSDOMExceptionHandling.cpp in Sources */,
 				B22279AD0D00BF220071B782 /* SVGDefsElement.cpp in Sources */,
 				B22279B00D00BF220071B782 /* SVGDescElement.cpp in Sources */,
 				B22279B30D00BF220071B782 /* SVGDocument.cpp in Sources */,
@@ -31768,7 +31777,6 @@
 				B22279CD0D00BF220071B782 /* SVGFEComponentTransferElement.cpp in Sources */,
 				B22279D00D00BF220071B782 /* SVGFECompositeElement.cpp in Sources */,
 				1921327411C0E6BB00456238 /* SVGFEConvolveMatrixElement.cpp in Sources */,
-				7C45C9CF1E3EFDF700AAB558 /* JSDOMBindingSecurity.cpp in Sources */,
 				B22279D30D00BF220071B782 /* SVGFEDiffuseLightingElement.cpp in Sources */,
 				B22279D60D00BF220071B782 /* SVGFEDisplacementMapElement.cpp in Sources */,
 				B22279D90D00BF220071B782 /* SVGFEDistantLightElement.cpp in Sources */,
@@ -31793,7 +31801,6 @@
 				B2227A080D00BF220071B782 /* SVGFETurbulenceElement.cpp in Sources */,
 				845E72FB0FD2623900A87D79 /* SVGFilter.cpp in Sources */,
 				081EBF3A0FD34F4100DA7559 /* SVGFilterBuilder.cpp in Sources */,
-				415080361E3F00AD0051D75D /* LibWebRTCAudioModule.cpp in Sources */,
 				B2227A0B0D00BF220071B782 /* SVGFilterElement.cpp in Sources */,
 				B2227A0E0D00BF220071B782 /* SVGFilterPrimitiveStandardAttributes.cpp in Sources */,
 				B2227A110D00BF220071B782 /* SVGFitToViewBox.cpp in Sources */,
@@ -31877,7 +31884,6 @@
 				7C39C3741DDBB8D300FEFB29 /* SVGTransformListValues.cpp in Sources */,
 				7CE58D571DD7D96D00128552 /* SVGTransformValue.cpp in Sources */,
 				B2227AE10D00BF220071B782 /* SVGTRefElement.cpp in Sources */,
-				076EC1331E44F56D00E5D813 /* AudioTrackPrivateMediaStreamCocoa.cpp in Sources */,
 				B2227AE40D00BF220071B782 /* SVGTSpanElement.cpp in Sources */,
 				B2227AE90D00BF220071B782 /* SVGURIReference.cpp in Sources */,
 				B2227AEC0D00BF220071B782 /* SVGUseElement.cpp in Sources */,
@@ -32064,6 +32070,7 @@
 				120DE3ED1C86CA3E00B6D4DD /* WebAnimation.cpp in Sources */,
 				07D637411BB0B11300256CE9 /* WebAudioSourceProviderAVFObjC.mm in Sources */,
 				CDA29A311CBF74DA00901CCF /* WebAVPlayerController.mm in Sources */,
+				1F36EA9D1E21BA1700621E25 /* WebBackgroundTaskController.mm in Sources */,
 				A56C5B9A189F34570082D13C /* WebConsoleAgent.cpp in Sources */,
 				CD7E05221651C28200C1201F /* WebCoreAVFResourceLoader.mm in Sources */,
 				2D3EF44B1917915C00034184 /* WebCoreCALayerExtras.mm in Sources */,
@@ -32130,6 +32137,7 @@
 				6F995A251A7078B100A735F4 /* WebGLVertexArrayObject.cpp in Sources */,
 				6F222B761AB52D8A0094651A /* WebGLVertexArrayObjectBase.cpp in Sources */,
 				77A17A7712F28642004E02F6 /* WebGLVertexArrayObjectOES.cpp in Sources */,
+				A5E2123B1E4924A100CE1044 /* WebHeapAgent.cpp in Sources */,
 				A5840E24187B8AC200843B10 /* WebInjectedScriptHost.cpp in Sources */,
 				A584FE2F1864CB8400843B10 /* WebInjectedScriptManager.cpp in Sources */,
 				F48223101E3869B80066FC79 /* WebItemProviderPasteboard.mm in Sources */,
@@ -32165,6 +32173,7 @@
 				4A5A2ADB161E7E00005889DD /* WebSocketExtensionParser.cpp in Sources */,
 				AAF5B7B71524B6C50004CB49 /* WebSocketFrame.cpp in Sources */,
 				97AABD2614FA09D5007457AE /* WebSocketHandshake.cpp in Sources */,
+				1F4B419B1E2301C900AC037F /* WebSQLiteDatabaseTrackerClient.mm in Sources */,
 				31DEA4551B39F4D900F77178 /* WebSystemBackdropLayer.mm in Sources */,
 				0F580FA41496939100FB5BD8 /* WebTiledBackingLayer.mm in Sources */,
 				CD82030B1395AB6A00F956C6 /* WebVideoFullscreenController.mm in Sources */,
@@ -32248,7 +32257,6 @@
 				85217E020A5ECD4700DB8D00 /* XSLImportRule.cpp in Sources */,
 				93F19B0308245E59001E9ABC /* XSLStyleSheetLibxslt.cpp in Sources */,
 				E1F1E82F0C3C2BB9006DB391 /* XSLTExtensions.cpp in Sources */,
-				1F4B419B1E2301C900AC037F /* WebSQLiteDatabaseTrackerClient.mm in Sources */,
 				93F19B0408245E59001E9ABC /* XSLTProcessor.cpp in Sources */,
 				93F19B0508245E59001E9ABC /* XSLTProcessorLibxslt.cpp in Sources */,
 				E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,

Modified: trunk/Source/WebCore/inspector/InspectorAllInOne.cpp (211770 => 211771)


--- trunk/Source/WebCore/inspector/InspectorAllInOne.cpp	2017-02-07 04:23:52 UTC (rev 211770)
+++ trunk/Source/WebCore/inspector/InspectorAllInOne.cpp	2017-02-07 04:27:05 UTC (rev 211771)
@@ -61,6 +61,7 @@
 #include "TimelineRecordFactory.cpp"
 #include "WebConsoleAgent.cpp"
 #include "WebDebuggerAgent.cpp"
+#include "WebHeapAgent.cpp"
 #include "WebInjectedScriptHost.cpp"
 #include "WebInjectedScriptManager.cpp"
 #include "WorkerConsoleAgent.cpp"

Modified: trunk/Source/WebCore/inspector/PageHeapAgent.cpp (211770 => 211771)


--- trunk/Source/WebCore/inspector/PageHeapAgent.cpp	2017-02-07 04:23:52 UTC (rev 211770)
+++ trunk/Source/WebCore/inspector/PageHeapAgent.cpp	2017-02-07 04:27:05 UTC (rev 211771)
@@ -31,7 +31,7 @@
 namespace WebCore {
 
 PageHeapAgent::PageHeapAgent(PageAgentContext& context)
-    : InspectorHeapAgent(context)
+    : WebHeapAgent(context)
     , m_instrumentingAgents(context.instrumentingAgents)
 {
 }
@@ -38,13 +38,13 @@
 
 void PageHeapAgent::enable(ErrorString& errorString)
 {
-    InspectorHeapAgent::enable(errorString);
+    WebHeapAgent::enable(errorString);
     m_instrumentingAgents.setPageHeapAgent(this);
 }
 
 void PageHeapAgent::disable(ErrorString& errorString)
 {
-    InspectorHeapAgent::disable(errorString);
+    WebHeapAgent::disable(errorString);
     m_instrumentingAgents.setPageHeapAgent(nullptr);
 }

Modified: trunk/Source/WebCore/inspector/PageHeapAgent.h (211770 => 211771)


--- trunk/Source/WebCore/inspector/PageHeapAgent.h	2017-02-07 04:23:52 UTC (rev 211770)
+++ trunk/Source/WebCore/inspector/PageHeapAgent.h	2017-02-07 04:27:05 UTC (rev 211771)
@@ -27,13 +27,13 @@
 
 #include "InspectorWebAgentBase.h"
 #include "InstrumentingAgents.h"
-#include <inspector/agents/InspectorHeapAgent.h>
+#include "WebHeapAgent.h"
 
 namespace WebCore {
 
 typedef String ErrorString;
 
-class PageHeapAgent final : public Inspector::InspectorHeapAgent {
+class PageHeapAgent final : public WebHeapAgent {
     WTF_MAKE_NONCOPYABLE(PageHeapAgent);
     WTF_MAKE_FAST_ALLOCATED;
 public:

Added: trunk/Source/WebCore/inspector/WebHeapAgent.cpp (0 => 211771)


--- trunk/Source/WebCore/inspector/WebHeapAgent.cpp	                        (rev 0)
+++ trunk/Source/WebCore/inspector/WebHeapAgent.cpp	2017-02-07 04:27:05 UTC (rev 211771)
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2015-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.
+ */
+
+#include "config.h"
+#include "WebHeapAgent.h"
+
+#include <wtf/RunLoop.h>
+
+using namespace Inspector;
+
+namespace WebCore {
+
+struct GarbageCollectionData {
+    Inspector::Protocol::Heap::GarbageCollection::Type type;
+    double startTime;
+    double endTime;
+};
+
+class SendGarbageCollectionEventsTask {
+public:
+    SendGarbageCollectionEventsTask(WebHeapAgent&);
+    void addGarbageCollection(GarbageCollectionData&&);
+    void reset();
+private:
+    void timerFired();
+
+    WebHeapAgent& m_agent;
+    Vector<GarbageCollectionData> m_collections;
+    RunLoop::Timer<SendGarbageCollectionEventsTask> m_timer;
+    Lock m_mutex;
+};
+
+SendGarbageCollectionEventsTask::SendGarbageCollectionEventsTask(WebHeapAgent& agent)
+    : m_agent(agent)
+    , m_timer(RunLoop::main(), this, &SendGarbageCollectionEventsTask::timerFired)
+{
+}
+
+void SendGarbageCollectionEventsTask::addGarbageCollection(GarbageCollectionData&& collection)
+{
+    {
+        std::lock_guard<Lock> lock(m_mutex);
+        m_collections.append(WTFMove(collection));
+    }
+
+    if (!m_timer.isActive())
+        m_timer.startOneShot(0);
+}
+
+void SendGarbageCollectionEventsTask::reset()
+{
+    {
+        std::lock_guard<Lock> lock(m_mutex);
+        m_collections.clear();
+    }
+
+    m_timer.stop();
+}
+
+void SendGarbageCollectionEventsTask::timerFired()
+{
+    Vector<GarbageCollectionData> collectionsToSend;
+
+    {
+        std::lock_guard<Lock> lock(m_mutex);
+        m_collections.swap(collectionsToSend);
+    }
+
+    m_agent.dispatchGarbageCollectionEventsAfterDelay(WTFMove(collectionsToSend));
+}
+
+WebHeapAgent::WebHeapAgent(Inspector::AgentContext& context)
+    : InspectorHeapAgent(context)
+    , m_sendGarbageCollectionEventsTask(std::make_unique<SendGarbageCollectionEventsTask>(*this))
+{
+}
+
+WebHeapAgent::~WebHeapAgent()
+{
+    m_sendGarbageCollectionEventsTask->reset();
+}
+
+void WebHeapAgent::disable(ErrorString& errorString)
+{
+    m_sendGarbageCollectionEventsTask->reset();
+
+    InspectorHeapAgent::disable(errorString);
+}
+
+void WebHeapAgent::dispatchGarbageCollectedEvent(Inspector::Protocol::Heap::GarbageCollection::Type type, double startTime, double endTime)
+{
+    // Dispatch the event asynchronously because this method may be
+    // called between collection and sweeping and we don't want to
+    // create unexpected _javascript_ allocations that the Sweeper does
+    // not expect to encounter. _javascript_ allocations could happen
+    // with WebKitLegacy's in process inspector which shares the same
+    // VM as the inspected page.
+
+    GarbageCollectionData data = "" startTime, endTime};
+    m_sendGarbageCollectionEventsTask->addGarbageCollection(WTFMove(data));
+}
+
+void WebHeapAgent::dispatchGarbageCollectionEventsAfterDelay(Vector<GarbageCollectionData>&& collections)
+{
+    for (auto& collection : collections)
+        InspectorHeapAgent::dispatchGarbageCollectedEvent(collection.type, collection.startTime, collection.endTime);
+}
+
+} // namespace WebCore

Copied: trunk/Source/WebCore/inspector/WebHeapAgent.h (from rev 211770, trunk/Source/WebCore/inspector/PageHeapAgent.h) (0 => 211771)


--- trunk/Source/WebCore/inspector/WebHeapAgent.h	                        (rev 0)
+++ trunk/Source/WebCore/inspector/WebHeapAgent.h	2017-02-07 04:27:05 UTC (rev 211771)
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <inspector/agents/InspectorHeapAgent.h>
+#include <wtf/Vector.h>
+
+namespace WebCore {
+
+class SendGarbageCollectionEventsTask;
+struct GarbageCollectionData;
+typedef String ErrorString;
+
+class WebHeapAgent : public Inspector::InspectorHeapAgent {
+    WTF_MAKE_NONCOPYABLE(WebHeapAgent);
+    WTF_MAKE_FAST_ALLOCATED;
+    friend class SendGarbageCollectionEventsTask;
+public:
+    WebHeapAgent(Inspector::AgentContext&);
+    virtual ~WebHeapAgent();
+
+protected:
+    void disable(ErrorString&) override;
+
+    void dispatchGarbageCollectedEvent(Inspector::Protocol::Heap::GarbageCollection::Type, double startTime, double endTime) override;
+
+    void dispatchGarbageCollectionEventsAfterDelay(Vector<GarbageCollectionData>&& collections);
+
+    std::unique_ptr<SendGarbageCollectionEventsTask> m_sendGarbageCollectionEventsTask;
+};
+
+} // namespace WebCore

Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (211770 => 211771)


--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp	2017-02-07 04:23:52 UTC (rev 211770)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp	2017-02-07 04:27:05 UTC (rev 211771)
@@ -29,6 +29,7 @@
 #include "CommandLineAPIHost.h"
 #include "InstrumentingAgents.h"
 #include "JSMainThreadExecState.h"
+#include "WebHeapAgent.h"
 #include "WebInjectedScriptHost.h"
 #include "WebInjectedScriptManager.h"
 #include "WorkerConsoleAgent.h"
@@ -42,7 +43,6 @@
 #include <inspector/InspectorFrontendChannel.h>
 #include <inspector/InspectorFrontendDispatchers.h>
 #include <inspector/InspectorFrontendRouter.h>
-#include <inspector/agents/InspectorHeapAgent.h>
 
 using namespace JSC;
 using namespace Inspector;
@@ -75,7 +75,7 @@
         workerGlobalScope,
     };
 
-    auto heapAgent = std::make_unique<InspectorHeapAgent>(workerContext);
+    auto heapAgent = std::make_unique<WebHeapAgent>(workerContext);
 
     m_agents.append(std::make_unique<WorkerRuntimeAgent>(workerContext));
     m_agents.append(std::make_unique<WorkerDebuggerAgent>(workerContext));

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to