Title: [257444] releases/WebKitGTK/webkit-2.28/Source/WebKit
- Revision
- 257444
- Author
- [email protected]
- Date
- 2020-02-26 02:57:04 -0800 (Wed, 26 Feb 2020)
Log Message
Merge r257103 - WebIDBServer resume should return early if suspend does not happen
https://bugs.webkit.org/show_bug.cgi?id=208027
<rdar://problem/59617654>
Reviewed by Geoffrey Garen.
We should not try releasing a lock that is not held.
* NetworkProcess/IndexedDB/WebIDBServer.cpp:
(WebKit::WebIDBServer::resume):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog (257443 => 257444)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-02-26 10:57:00 UTC (rev 257443)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-02-26 10:57:04 UTC (rev 257444)
@@ -1,3 +1,16 @@
+2020-02-20 Sihui Liu <[email protected]>
+
+ WebIDBServer resume should return early if suspend does not happen
+ https://bugs.webkit.org/show_bug.cgi?id=208027
+ <rdar://problem/59617654>
+
+ Reviewed by Geoffrey Garen.
+
+ We should not try releasing a lock that is not held.
+
+ * NetworkProcess/IndexedDB/WebIDBServer.cpp:
+ (WebKit::WebIDBServer::resume):
+
2020-02-20 Chris Dumez <[email protected]>
REGRESSION (r255677): Reloading tab with beforeunload prompt closes tab when asking to stay on page
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp (257443 => 257444)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp 2020-02-26 10:57:00 UTC (rev 257443)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp 2020-02-26 10:57:04 UTC (rev 257444)
@@ -102,9 +102,10 @@
void WebIDBServer::resume()
{
ASSERT(RunLoop::isMain());
- ASSERT(m_isSuspended);
- ASSERT(m_server->lock().isHeld());
+ if (!m_isSuspended)
+ return;
+
m_isSuspended = false;
m_server->lock().unlock();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
