Title: [234807] branches/safari-606.1.36.1-branch/Source/WebCore
Revision
234807
Author
[email protected]
Date
2018-08-13 11:06:53 -0700 (Mon, 13 Aug 2018)

Log Message

Cherry-pick r234766. rdar://problem/43240328

    CrashTracer: com.apple.WebKit.Storage at WebCore::IDBServer::UniqueIDBDatabase::scheduleShutdownForClose
    https://bugs.webkit.org/show_bug.cgi?id=188461
    <rdar://problem/33555052>

    Reviewed by Chris Dumez.

    When we try to schedule shutdown for database, we should cancel the timer so no
    scheduleShutdownForClose will be running after this.

    * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
    (WebCore::IDBServer::UniqueIDBDatabase::scheduleShutdownForClose):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234766 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-606.1.36.1-branch/Source/WebCore/ChangeLog (234806 => 234807)


--- branches/safari-606.1.36.1-branch/Source/WebCore/ChangeLog	2018-08-13 18:06:50 UTC (rev 234806)
+++ branches/safari-606.1.36.1-branch/Source/WebCore/ChangeLog	2018-08-13 18:06:53 UTC (rev 234807)
@@ -1,5 +1,38 @@
 2018-08-13  Kocsen Chung  <[email protected]>
 
+        Cherry-pick r234766. rdar://problem/43240328
+
+    CrashTracer: com.apple.WebKit.Storage at WebCore::IDBServer::UniqueIDBDatabase::scheduleShutdownForClose
+    https://bugs.webkit.org/show_bug.cgi?id=188461
+    <rdar://problem/33555052>
+    
+    Reviewed by Chris Dumez.
+    
+    When we try to schedule shutdown for database, we should cancel the timer so no
+    scheduleShutdownForClose will be running after this.
+    
+    * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+    (WebCore::IDBServer::UniqueIDBDatabase::scheduleShutdownForClose):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234766 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-08-10  Sihui Liu  <[email protected]>
+
+            CrashTracer: com.apple.WebKit.Storage at WebCore::IDBServer::UniqueIDBDatabase::scheduleShutdownForClose
+            https://bugs.webkit.org/show_bug.cgi?id=188461
+            <rdar://problem/33555052>
+
+            Reviewed by Chris Dumez.
+
+            When we try to schedule shutdown for database, we should cancel the timer so no
+            scheduleShutdownForClose will be running after this.
+
+            * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+            (WebCore::IDBServer::UniqueIDBDatabase::scheduleShutdownForClose):
+
+2018-08-13  Kocsen Chung  <[email protected]>
+
         Cherry-pick r234778. rdar://problem/43240324
 
     [macOS] Multiple third party apps crash due to the thread safety check in TimerBase::setNextFireTime

Modified: branches/safari-606.1.36.1-branch/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (234806 => 234807)


--- branches/safari-606.1.36.1-branch/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp	2018-08-13 18:06:50 UTC (rev 234806)
+++ branches/safari-606.1.36.1-branch/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp	2018-08-13 18:06:53 UTC (rev 234807)
@@ -273,6 +273,8 @@
 {
     ASSERT(isMainThread());
 
+    m_operationAndTransactionTimer.stop();
+
     RELEASE_ASSERT(!m_owningPointerForClose);
     m_owningPointerForClose = m_server.closeAndTakeUniqueIDBDatabase(*this);
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to