<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[277890] trunk/Source/WebKitLegacy</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/277890">277890</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2021-05-21 14:29:02 -0700 (Fri, 21 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Adopt CheckedLock in StorageAreaSync
https://bugs.webkit.org/show_bug.cgi?id=226099

Reviewed by Sam Weinig.

Adopt CheckedLock in StorageAreaSync to benefit from Clang Thread Safety Analysis.

* Storage/StorageAreaSync.cpp:
(WebKit::StorageAreaSync::markImported):
(WebKit::StorageAreaSync::blockUntilImportComplete):
* Storage/StorageAreaSync.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitLegacyChangeLog">trunk/Source/WebKitLegacy/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitLegacyStorageStorageAreaSynccpp">trunk/Source/WebKitLegacy/Storage/StorageAreaSync.cpp</a></li>
<li><a href="#trunkSourceWebKitLegacyStorageStorageAreaSynch">trunk/Source/WebKitLegacy/Storage/StorageAreaSync.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitLegacyChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/ChangeLog (277889 => 277890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/ChangeLog      2021-05-21 21:28:01 UTC (rev 277889)
+++ trunk/Source/WebKitLegacy/ChangeLog 2021-05-21 21:29:02 UTC (rev 277890)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-05-21  Chris Dumez  <cdumez@apple.com>
+
+        Adopt CheckedLock in StorageAreaSync
+        https://bugs.webkit.org/show_bug.cgi?id=226099
+
+        Reviewed by Sam Weinig.
+
+        Adopt CheckedLock in StorageAreaSync to benefit from Clang Thread Safety Analysis.
+
+        * Storage/StorageAreaSync.cpp:
+        (WebKit::StorageAreaSync::markImported):
+        (WebKit::StorageAreaSync::blockUntilImportComplete):
+        * Storage/StorageAreaSync.h:
+
</ins><span class="cx"> 2021-05-19  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Add support for Navigation Timing Level 2
</span></span></pre></div>
<a id="trunkSourceWebKitLegacyStorageStorageAreaSynccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/Storage/StorageAreaSync.cpp (277889 => 277890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/Storage/StorageAreaSync.cpp    2021-05-21 21:28:01 UTC (rev 277889)
+++ trunk/Source/WebKitLegacy/Storage/StorageAreaSync.cpp       2021-05-21 21:29:02 UTC (rev 277890)
</span><span class="lines">@@ -354,7 +354,7 @@
</span><span class="cx"> 
</span><span class="cx"> void StorageAreaSync::markImported()
</span><span class="cx"> {
</span><del>-    LockHolder locker(m_importLock);
</del><ins>+    Locker locker { m_importLock };
</ins><span class="cx">     m_importComplete = true;
</span><span class="cx">     m_importCondition.notifyOne();
</span><span class="cx"> }
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx">     if (!m_storageArea)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    LockHolder locker(m_importLock);
</del><ins>+    Locker locker { m_importLock };
</ins><span class="cx">     while (!m_importComplete)
</span><span class="cx">         m_importCondition.wait(m_importLock);
</span><span class="cx">     m_storageArea = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebKitLegacyStorageStorageAreaSynch"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/Storage/StorageAreaSync.h (277889 => 277890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/Storage/StorageAreaSync.h      2021-05-21 21:28:01 UTC (rev 277889)
+++ trunk/Source/WebKitLegacy/Storage/StorageAreaSync.h 2021-05-21 21:29:02 UTC (rev 277890)
</span><span class="lines">@@ -27,7 +27,8 @@
</span><span class="cx"> 
</span><span class="cx"> #include <WebCore/SQLiteDatabase.h>
</span><span class="cx"> #include <WebCore/Timer.h>
</span><del>-#include <wtf/Condition.h>
</del><ins>+#include <wtf/CheckedCondition.h>
+#include <wtf/CheckedLock.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> 
</span><span class="lines">@@ -96,9 +97,9 @@
</span><span class="cx"> 
</span><span class="cx">     bool m_syncCloseDatabase;
</span><span class="cx"> 
</span><del>-    mutable Lock m_importLock;
-    Condition m_importCondition;
-    bool m_importComplete;
</del><ins>+    mutable CheckedLock m_importLock;
+    CheckedCondition m_importCondition;
+    bool m_importComplete WTF_GUARDED_BY_LOCK(m_importLock);
</ins><span class="cx">     void markImported();
</span><span class="cx">     void migrateItemTableIfNeeded();
</span><span class="cx"> };
</span></span></pre>
</div>
</div>

</body>
</html>