Title: [241692] releases/WebKitGTK/webkit-2.24/Source/WebCore
Revision
241692
Author
carlo...@webkit.org
Date
2019-02-18 08:14:58 -0800 (Mon, 18 Feb 2019)

Log Message

Merge r241598 - Performance should not fire events when its context is stopped
https://bugs.webkit.org/show_bug.cgi?id=194689

Reviewed by Alex Christensen.

Stop the timer when its context is destroyed.
Add an assertion to ensure the timer does not fire after context is destroyed.

* page/Performance.cpp:
(WebCore::Performance::stop):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog (241691 => 241692)


--- releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog	2019-02-18 16:14:54 UTC (rev 241691)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog	2019-02-18 16:14:58 UTC (rev 241692)
@@ -1,3 +1,16 @@
+2019-02-15  Youenn Fablet  <you...@apple.com>
+
+        Performance should not fire events when its context is stopped
+        https://bugs.webkit.org/show_bug.cgi?id=194689
+
+        Reviewed by Alex Christensen.
+
+        Stop the timer when its context is destroyed.
+        Add an assertion to ensure the timer does not fire after context is destroyed.
+
+        * page/Performance.cpp:
+        (WebCore::Performance::stop):
+
 2019-02-15  Zalan Bujtas  <za...@apple.com>
 
         [LFC] Out-of-flow box is never a float box

Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/page/Performance.cpp (241691 => 241692)


--- releases/WebKitGTK/webkit-2.24/Source/WebCore/page/Performance.cpp	2019-02-18 16:14:54 UTC (rev 241691)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/page/Performance.cpp	2019-02-18 16:14:58 UTC (rev 241692)
@@ -64,7 +64,7 @@
 void Performance::contextDestroyed()
 {
     m_performanceTimelineTaskQueue.close();
-
+    m_resourceTimingBufferFullTimer.stop();
     ContextDestructionObserver::contextDestroyed();
 }
 
@@ -211,6 +211,8 @@
 
 void Performance::resourceTimingBufferFullTimerFired()
 {
+    ASSERT(scriptExecutionContext());
+
     while (!m_backupResourceTimingBuffer.isEmpty()) {
         auto backupBuffer = WTFMove(m_backupResourceTimingBuffer);
         ASSERT(m_backupResourceTimingBuffer.isEmpty());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to