Changeset 280988 in webkit

Timestamp:

Aug 12, 2021, 3:27:09 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Unreviewed, reverting r280977.

Seems to have broken a test in debug

Reverted changeset:

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

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>
+
+        Unreviewed, reverting r280977.
+
+        Seems to have broken a test in debug
+
+        Reverted changeset:
+
+        "Migrate Performance::resourceTimingBufferFullTimerFired to
+        HTML event loop"
+        https://bugs.webkit.org/show_bug.cgi?id=229044
+        https://commits.webkit.org/r280977
+
 2021-08-12  Alex Christensen  <achristensen@webkit.org>
 

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. https://bugs.webkit.org/show_bug.cgi?id=229044
     , m_timeOrigin(timeOrigin)
 {
@@ -67 +68 @@
 
 Performance::~Performance() = default;
+
+void Performance::contextDestroyed()
+{
+    m_resourceTimingBufferFullTimer.stop();
+    ContextDestructionObserver::contextDestroyed();
+}
 
 DOMHighResTimeStamp Performance::now() const
@@ -257 +264 @@
 
     if (isResourceTimingBufferFull()) {
+        ASSERT(!m_resourceTimingBufferFullTimer.isActive());
         m_backupResourceTimingBuffer.append(WTFMove(entry));
         m_waitingForBackupBufferToBeProcessed = true;
-        auto* context = scriptExecutionContext();
-        if (!context)
-            return;
-        context->eventLoop().queueTask(TaskSource::PerformanceTimeline, [protectedThis = makeRef(*this)] {
-            protectedThis->dispatchResourceTimingBufferFullEvent();
-        });
+        m_resourceTimingBufferFullTimer.startOneShot(0_s);
         return;
     }
@@ -277 +280 @@
 }
 
-void Performance::dispatchResourceTimingBufferFullEvent()
-{
-    if (!scriptExecutionContext())
-        return;
+void Performance::resourceTimingBufferFullTimerFired()
+{
+    ASSERT(scriptExecutionContext());
 
     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; }
 
@@ -126 +128 @@
 
     bool isResourceTimingBufferFull() const;
-    void dispatchResourceTimingBufferFullEvent();
+    void resourceTimingBufferFullTimerFired();
 
     void queueEntry(PerformanceEntry&);
@@ -138 +140 @@
     unsigned m_resourceTimingBufferSize { 150 };
 
+    Timer m_resourceTimingBufferFullTimer;
     Vector<RefPtr<PerformanceEntry>> m_backupResourceTimingBuffer;