Changeset 280977 in webkit

Timestamp:

Aug 12, 2021, 12:25:04 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Migrate Performance::resourceTimingBufferFullTimerFired to HTML event loop
​https://bugs.webkit.org/show_bug.cgi?id=229044

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-08-12
Reviewed by Geoff Garen.

Covered by existing tests.
There should be no change in behavior.

• page/Performance.cpp:

(WebCore::Performance::Performance):
(WebCore::Performance::addResourceTiming):
(WebCore::Performance::dispatchResourceTimingBufferFullEvent):
(WebCore::Performance::contextDestroyed): Deleted.
(WebCore::Performance::resourceTimingBufferFullTimerFired): Deleted.

• page/Performance.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Performance.cpp (modified) (4 diffs)
• page/Performance.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-12  Alex Christensen  <achristensen@webkit.org>
+
+        Migrate Performance::resourceTimingBufferFullTimerFired to HTML event loop
+        https://bugs.webkit.org/show_bug.cgi?id=229044
+
+        Reviewed by Geoff Garen.
+
+        Covered by existing tests.
+        There should be no change in behavior.
+
+        * page/Performance.cpp:
+        (WebCore::Performance::Performance):
+        (WebCore::Performance::addResourceTiming):
+        (WebCore::Performance::dispatchResourceTimingBufferFullEvent):
+        (WebCore::Performance::contextDestroyed): Deleted.
+        (WebCore::Performance::resourceTimingBufferFullTimerFired): Deleted.
+        * page/Performance.h:
+
 2021-08-12  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/page/Performance.cpp

@@ -61 +61 @@
 Performance::Performance(ScriptExecutionContext* context, MonotonicTime timeOrigin)
     : ContextDestructionObserver(context)
-    , m_resourceTimingBufferFullTimer(*this, &Performance::resourceTimingBufferFullTimerFired) // FIXME: Migrate this to the event loop as well.
     , m_timeOrigin(timeOrigin)
 {
@@ -68 +67 @@
 
 Performance::~Performance() = default;
-
-void Performance::contextDestroyed()
-{
-    m_resourceTimingBufferFullTimer.stop();
-    ContextDestructionObserver::contextDestroyed();
-}
 
 DOMHighResTimeStamp Performance::now() const
@@ -264 +257 @@
 
     if (isResourceTimingBufferFull()) {
-        ASSERT(!m_resourceTimingBufferFullTimer.isActive());
         m_backupResourceTimingBuffer.append(WTFMove(entry));
         m_waitingForBackupBufferToBeProcessed = true;
-        m_resourceTimingBufferFullTimer.startOneShot(0_s);
+        auto* context = scriptExecutionContext();
+        if (!context)
+            return;
+        context->eventLoop().queueTask(TaskSource::PerformanceTimeline, [protectedThis = makeRef(*this)] {
+            protectedThis->dispatchResourceTimingBufferFullEvent();
+        });
         return;
     }
@@ -280 +277 @@
 }
 
-void Performance::resourceTimingBufferFullTimerFired()
-{
-    ASSERT(scriptExecutionContext());
+void Performance::dispatchResourceTimingBufferFullEvent()
+{
+    if (!scriptExecutionContext())
+        return;
 
     while (!m_backupResourceTimingBuffer.isEmpty()) {

trunk/Source/WebCore/page/Performance.h

@@ -120 +120 @@
     Performance(ScriptExecutionContext*, MonotonicTime timeOrigin);
 
-    void contextDestroyed() override;
-
     EventTargetInterface eventTargetInterface() const final { return PerformanceEventTargetInterfaceType; }
 
@@ -128 +126 @@
 
     bool isResourceTimingBufferFull() const;
-    void resourceTimingBufferFullTimerFired();
+    void dispatchResourceTimingBufferFullEvent();
 
     void queueEntry(PerformanceEntry&);
@@ -140 +138 @@
     unsigned m_resourceTimingBufferSize { 150 };
 
-    Timer m_resourceTimingBufferFullTimer;
     Vector<RefPtr<PerformanceEntry>> m_backupResourceTimingBuffer;