<!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>[242888] branches/safari-607-branch/Source/WebKit</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/242888">242888</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2019-03-13 10:28:21 -0700 (Wed, 13 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Apply patch. rdar://problem/48839383

    Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/242230">r242230</a>. rdar://problem/48839383

        Revert <a href="http://trac.webkit.org/projects/webkit/changeset/232263">r232263</a>: it caused processes to crash because process was suspended with locked file
        https://bugs.webkit.org/show_bug.cgi?id=195122
        <rdar://problem/48444599>

        Reviewed by Geoffrey Garen.

        * NetworkProcess/NetworkProcess.cpp:
        (WebKit::NetworkProcess::NetworkProcess):
        * NetworkProcess/NetworkProcess.h:
        * Shared/WebSQLiteDatabaseTracker.cpp:
        (WebKit::WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker):
        (WebKit::WebSQLiteDatabaseTracker::hysteresisUpdated):
        * Shared/WebSQLiteDatabaseTracker.h:
        * WebProcess/WebProcess.cpp:
        (WebKit::m_webSQLiteDatabaseTracker):
        (WebKit::m_nonVisibleProcessCleanupTimer): Deleted.
        * WebProcess/WebProcess.h:

        git-svn-id: http://svn.webkit.org/repository/webkit/trunk@242230 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari607branchSourceWebKitChangeLog">branches/safari-607-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari607branchSourceWebKitNetworkProcessNetworkProcesscpp">branches/safari-607-branch/Source/WebKit/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#branchessafari607branchSourceWebKitNetworkProcessNetworkProcessh">branches/safari-607-branch/Source/WebKit/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#branchessafari607branchSourceWebKitSharedWebSQLiteDatabaseTrackercpp">branches/safari-607-branch/Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp</a></li>
<li><a href="#branchessafari607branchSourceWebKitWebProcessWebProcesscpp">branches/safari-607-branch/Source/WebKit/WebProcess/WebProcess.cpp</a></li>
<li><a href="#branchessafari607branchSourceWebKitWebProcessWebProcessh">branches/safari-607-branch/Source/WebKit/WebProcess/WebProcess.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari607branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebKit/ChangeLog (242887 => 242888)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebKit/ChangeLog       2019-03-13 17:25:23 UTC (rev 242887)
+++ branches/safari-607-branch/Source/WebKit/ChangeLog  2019-03-13 17:28:21 UTC (rev 242888)
</span><span class="lines">@@ -1,5 +1,76 @@
</span><span class="cx"> 2019-03-13  Babak Shafiei  <bshafiei@apple.com>
</span><span class="cx"> 
</span><ins>+        Apply patch. rdar://problem/48839383
+
+    Cherry-pick r242230. rdar://problem/48839383
+    
+        Revert r232263: it caused processes to crash because process was suspended with locked file
+        https://bugs.webkit.org/show_bug.cgi?id=195122
+        <rdar://problem/48444599>
+    
+        Reviewed by Geoffrey Garen.
+    
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::NetworkProcess):
+        * NetworkProcess/NetworkProcess.h:
+        * Shared/WebSQLiteDatabaseTracker.cpp:
+        (WebKit::WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker):
+        (WebKit::WebSQLiteDatabaseTracker::hysteresisUpdated):
+        * Shared/WebSQLiteDatabaseTracker.h:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::m_webSQLiteDatabaseTracker):
+        (WebKit::m_nonVisibleProcessCleanupTimer): Deleted.
+        * WebProcess/WebProcess.h:
+    
+        git-svn-id: http://svn.webkit.org/repository/webkit/trunk@242230 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-13  Babak Shafiei  <bshafiei@apple.com>
+
+            Cherry-pick r242230. rdar://problem/48839383
+
+        Revert r232263: it caused processes to crash because process was suspended with locked file
+        https://bugs.webkit.org/show_bug.cgi?id=195122
+        <rdar://problem/48444599>
+
+        Reviewed by Geoffrey Garen.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::NetworkProcess):
+        * NetworkProcess/NetworkProcess.h:
+        * Shared/WebSQLiteDatabaseTracker.cpp:
+        (WebKit::WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker):
+        (WebKit::WebSQLiteDatabaseTracker::hysteresisUpdated):
+        * Shared/WebSQLiteDatabaseTracker.h:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::m_webSQLiteDatabaseTracker):
+        (WebKit::m_nonVisibleProcessCleanupTimer): Deleted.
+        * WebProcess/WebProcess.h:
+
+
+        git-svn-id: http://svn.webkit.org/repository/webkit/trunk@242230 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+        2019-02-28  Sihui Liu  <sihui_liu@apple.com>
+
+            Revert r232263: it caused processes to crash because process was suspended with locked file
+            https://bugs.webkit.org/show_bug.cgi?id=195122
+            <rdar://problem/48444599>
+
+            Reviewed by Geoffrey Garen.
+
+            * NetworkProcess/NetworkProcess.cpp:
+            (WebKit::NetworkProcess::NetworkProcess):
+            * NetworkProcess/NetworkProcess.h:
+            * Shared/WebSQLiteDatabaseTracker.cpp:
+            (WebKit::WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker):
+            (WebKit::WebSQLiteDatabaseTracker::hysteresisUpdated):
+            * Shared/WebSQLiteDatabaseTracker.h:
+            * WebProcess/WebProcess.cpp:
+            (WebKit::m_webSQLiteDatabaseTracker):
+            (WebKit::m_nonVisibleProcessCleanupTimer): Deleted.
+            * WebProcess/WebProcess.h:
+
+2019-03-13  Babak Shafiei  <bshafiei@apple.com>
+
</ins><span class="cx">         Cherry-pick r242735. rdar://problem/48780112
</span><span class="cx"> 
</span><span class="cx">     Add a WKContentRuleList variant that uses copied memory instead of mmap'd shared memory for class A containerized apps
</span></span></pre></div>
<a id="branchessafari607branchSourceWebKitNetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebKit/NetworkProcess/NetworkProcess.cpp (242887 => 242888)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebKit/NetworkProcess/NetworkProcess.cpp       2019-03-13 17:25:23 UTC (rev 242887)
+++ branches/safari-607-branch/Source/WebKit/NetworkProcess/NetworkProcess.cpp  2019-03-13 17:28:21 UTC (rev 242888)
</span><span class="lines">@@ -127,6 +127,9 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     , m_clearCacheDispatchGroup(0)
</span><span class="cx"> #endif
</span><ins>+#if PLATFORM(IOS_FAMILY)
+    , m_webSQLiteDatabaseTracker(*this)
+#endif
</ins><span class="cx">     , m_storageTaskQueue(WorkQueue::create("com.apple.WebKit.StorageTask"))
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">     , m_idbPerOriginQuota(IDBServer::defaultPerOriginQuota)
</span></span></pre></div>
<a id="branchessafari607branchSourceWebKitNetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebKit/NetworkProcess/NetworkProcess.h (242887 => 242888)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-03-13 17:25:23 UTC (rev 242887)
+++ branches/safari-607-branch/Source/WebKit/NetworkProcess/NetworkProcess.h    2019-03-13 17:28:21 UTC (rev 242888)
</span><span class="lines">@@ -45,6 +45,10 @@
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> 
</span><ins>+#if PLATFORM(IOS_FAMILY)
+#include "WebSQLiteDatabaseTracker.h"
+#endif
+
</ins><span class="cx"> namespace IPC {
</span><span class="cx"> class FormDataReference;
</span><span class="cx"> }
</span><span class="lines">@@ -378,6 +382,10 @@
</span><span class="cx">     NetworkContentRuleListManager m_NetworkContentRuleListManager;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(IOS_FAMILY)
+    WebSQLiteDatabaseTracker m_webSQLiteDatabaseTracker;
+#endif
+
</ins><span class="cx">     Ref<WorkQueue> m_storageTaskQueue;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="branchessafari607branchSourceWebKitSharedWebSQLiteDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp (242887 => 242888)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp     2019-03-13 17:25:23 UTC (rev 242887)
+++ branches/safari-607-branch/Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp        2019-03-13 17:28:21 UTC (rev 242888)
</span><span class="lines">@@ -75,6 +75,8 @@
</span><span class="cx">     case ChildProcessType::Network:
</span><span class="cx">         m_process.parentProcessConnection()->send(Messages::NetworkProcessProxy::SetIsHoldingLockedFiles(state == PAL::HysteresisState::Started), 0);
</span><span class="cx">         break;
</span><ins>+    default:
+        ASSERT_NOT_REACHED();
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari607branchSourceWebKitWebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebKit/WebProcess/WebProcess.cpp (242887 => 242888)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebKit/WebProcess/WebProcess.cpp       2019-03-13 17:25:23 UTC (rev 242887)
+++ branches/safari-607-branch/Source/WebKit/WebProcess/WebProcess.cpp  2019-03-13 17:28:21 UTC (rev 242888)
</span><span class="lines">@@ -182,6 +182,9 @@
</span><span class="cx">     , m_pluginProcessConnectionManager(PluginProcessConnectionManager::create())
</span><span class="cx"> #endif
</span><span class="cx">     , m_nonVisibleProcessCleanupTimer(*this, &WebProcess::nonVisibleProcessCleanupTimerFired)
</span><ins>+#if PLATFORM(IOS_FAMILY)
+    , m_webSQLiteDatabaseTracker(*this)
+#endif
</ins><span class="cx"> {
</span><span class="cx">     // Initialize our platform strategies.
</span><span class="cx">     WebPlatformStrategies::initialize();
</span></span></pre></div>
<a id="branchessafari607branchSourceWebKitWebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebKit/WebProcess/WebProcess.h (242887 => 242888)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebKit/WebProcess/WebProcess.h 2019-03-13 17:25:23 UTC (rev 242887)
+++ branches/safari-607-branch/Source/WebKit/WebProcess/WebProcess.h    2019-03-13 17:28:21 UTC (rev 242888)
</span><span class="lines">@@ -52,6 +52,10 @@
</span><span class="cx"> #include <wtf/MachSendRight.h>
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(IOS_FAMILY)
+#include "WebSQLiteDatabaseTracker.h"
+#endif
+
</ins><span class="cx"> namespace API {
</span><span class="cx"> class Object;
</span><span class="cx"> }
</span><span class="lines">@@ -462,6 +466,10 @@
</span><span class="cx"> 
</span><span class="cx">     RefPtr<WebCore::ApplicationCacheStorage> m_applicationCacheStorage;
</span><span class="cx"> 
</span><ins>+#if PLATFORM(IOS_FAMILY)
+    WebSQLiteDatabaseTracker m_webSQLiteDatabaseTracker;
+#endif
+
</ins><span class="cx">     enum PageMarkingLayersAsVolatileCounterType { };
</span><span class="cx">     using PageMarkingLayersAsVolatileCounter = RefCounter<PageMarkingLayersAsVolatileCounterType>;
</span><span class="cx">     std::unique_ptr<PageMarkingLayersAsVolatileCounter> m_pageMarkingLayersAsVolatileCounter;
</span></span></pre>
</div>
</div>

</body>
</html>