Title: [242888] branches/safari-607-branch/Source/WebKit
- Revision
- 242888
- Author
- [email protected]
- Date
- 2019-03-13 10:28:21 -0700 (Wed, 13 Mar 2019)
Log Message
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
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/WebKit/ChangeLog (242887 => 242888)
--- 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)
@@ -1,5 +1,76 @@
2019-03-13 Babak Shafiei <[email protected]>
+ 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 <[email protected]>
+
+ 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 <[email protected]>
+
+ 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 <[email protected]>
+
Cherry-pick r242735. rdar://problem/48780112
Add a WKContentRuleList variant that uses copied memory instead of mmap'd shared memory for class A containerized apps
Modified: branches/safari-607-branch/Source/WebKit/NetworkProcess/NetworkProcess.cpp (242887 => 242888)
--- 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)
@@ -127,6 +127,9 @@
#if PLATFORM(COCOA)
, m_clearCacheDispatchGroup(0)
#endif
+#if PLATFORM(IOS_FAMILY)
+ , m_webSQLiteDatabaseTracker(*this)
+#endif
, m_storageTaskQueue(WorkQueue::create("com.apple.WebKit.StorageTask"))
#if ENABLE(INDEXED_DATABASE)
, m_idbPerOriginQuota(IDBServer::defaultPerOriginQuota)
Modified: branches/safari-607-branch/Source/WebKit/NetworkProcess/NetworkProcess.h (242887 => 242888)
--- 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)
@@ -45,6 +45,10 @@
#include <wtf/NeverDestroyed.h>
#include <wtf/RetainPtr.h>
+#if PLATFORM(IOS_FAMILY)
+#include "WebSQLiteDatabaseTracker.h"
+#endif
+
namespace IPC {
class FormDataReference;
}
@@ -378,6 +382,10 @@
NetworkContentRuleListManager m_NetworkContentRuleListManager;
#endif
+#if PLATFORM(IOS_FAMILY)
+ WebSQLiteDatabaseTracker m_webSQLiteDatabaseTracker;
+#endif
+
Ref<WorkQueue> m_storageTaskQueue;
#if ENABLE(INDEXED_DATABASE)
Modified: branches/safari-607-branch/Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp (242887 => 242888)
--- 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)
@@ -75,6 +75,8 @@
case ChildProcessType::Network:
m_process.parentProcessConnection()->send(Messages::NetworkProcessProxy::SetIsHoldingLockedFiles(state == PAL::HysteresisState::Started), 0);
break;
+ default:
+ ASSERT_NOT_REACHED();
}
}
Modified: branches/safari-607-branch/Source/WebKit/WebProcess/WebProcess.cpp (242887 => 242888)
--- 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)
@@ -182,6 +182,9 @@
, m_pluginProcessConnectionManager(PluginProcessConnectionManager::create())
#endif
, m_nonVisibleProcessCleanupTimer(*this, &WebProcess::nonVisibleProcessCleanupTimerFired)
+#if PLATFORM(IOS_FAMILY)
+ , m_webSQLiteDatabaseTracker(*this)
+#endif
{
// Initialize our platform strategies.
WebPlatformStrategies::initialize();
Modified: branches/safari-607-branch/Source/WebKit/WebProcess/WebProcess.h (242887 => 242888)
--- 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)
@@ -52,6 +52,10 @@
#include <wtf/MachSendRight.h>
#endif
+#if PLATFORM(IOS_FAMILY)
+#include "WebSQLiteDatabaseTracker.h"
+#endif
+
namespace API {
class Object;
}
@@ -462,6 +466,10 @@
RefPtr<WebCore::ApplicationCacheStorage> m_applicationCacheStorage;
+#if PLATFORM(IOS_FAMILY)
+ WebSQLiteDatabaseTracker m_webSQLiteDatabaseTracker;
+#endif
+
enum PageMarkingLayersAsVolatileCounterType { };
using PageMarkingLayersAsVolatileCounter = RefCounter<PageMarkingLayersAsVolatileCounterType>;
std::unique_ptr<PageMarkingLayersAsVolatileCounter> m_pageMarkingLayersAsVolatileCounter;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
