<!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>[277499] trunk</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/277499">277499</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2021-05-14 11:26:20 -0700 (Fri, 14 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Introduce FileSystem::updateFileModificationTime()
https://bugs.webkit.org/show_bug.cgi?id=225810

Reviewed by Darin Adler.

Source/WebKit:

Call the new FileSystem::updateFileModificationTime() API to modify the
file modification time instead of having low-level platform-specific
file system code at the WebKit2 layer.

* NetworkProcess/cache/NetworkCacheFileSystem.cpp:
(WebKit::NetworkCache::updateFileModificationTimeIfNeeded):

Source/WTF:

Introduce FileSystem::updateFileModificationTime() to update the modification time of a
file. The implementation is cross-platform and relies on std::filesystem. It allows us
to replace platform-specific code that we had at the WebKit2 layer.

* wtf/FileSystem.cpp:
(WTF::FileSystemImpl::updateFileModificationTime):
* wtf/FileSystem.h:

Tools:

Add API test coverage.

* TestWebKitAPI/Tests/WTF/FileSystem.cpp:
(TestWebKitAPI::TEST_F):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFileSystemcpp">trunk/Source/WTF/wtf/FileSystem.cpp</a></li>
<li><a href="#trunkSourceWTFwtfFileSystemh">trunk/Source/WTF/wtf/FileSystem.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitNetworkProcesscacheNetworkCacheFileSystemcpp">trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFFileSystemcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/FileSystem.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (277498 => 277499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2021-05-14 17:54:23 UTC (rev 277498)
+++ trunk/Source/WTF/ChangeLog  2021-05-14 18:26:20 UTC (rev 277499)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2021-05-14  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><ins>+        Introduce FileSystem::updateFileModificationTime()
+        https://bugs.webkit.org/show_bug.cgi?id=225810
+
+        Reviewed by Darin Adler.
+
+        Introduce FileSystem::updateFileModificationTime() to update the modification time of a
+        file. The implementation is cross-platform and relies on std::filesystem. It allows us
+        to replace platform-specific code that we had at the WebKit2 layer.
+
+        * wtf/FileSystem.cpp:
+        (WTF::FileSystemImpl::updateFileModificationTime):
+        * wtf/FileSystem.h:
+
+2021-05-14  Chris Dumez  <cdumez@apple.com>
+
</ins><span class="cx">         Drop unused FileSystem::homeDirectoryPath()
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=225808
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWTFwtfFileSystemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FileSystem.cpp (277498 => 277499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FileSystem.cpp      2021-05-14 17:54:23 UTC (rev 277498)
+++ trunk/Source/WTF/wtf/FileSystem.cpp 2021-05-14 18:26:20 UTC (rev 277499)
</span><span class="lines">@@ -686,6 +686,13 @@
</span><span class="cx">     return toWallTime(modificationTime);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool updateFileModificationTime(const String& path)
+{
+    std::error_code ec;
+    std::filesystem::last_write_time(toStdFileSystemPath(path), std::filesystem::file_time_type::clock::now(), ec);
+    return !ec;
+}
+
</ins><span class="cx"> enum class ShouldFollowSymbolicLinks { No, Yes };
</span><span class="cx"> static Optional<FileMetadata> fileMetadataPotentiallyFollowingSymlinks(const String& path, ShouldFollowSymbolicLinks shouldFollowSymbolicLinks)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWTFwtfFileSystemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FileSystem.h (277498 => 277499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FileSystem.h        2021-05-14 17:54:23 UTC (rev 277498)
+++ trunk/Source/WTF/wtf/FileSystem.h   2021-05-14 18:26:20 UTC (rev 277499)
</span><span class="lines">@@ -114,6 +114,7 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE Optional<uint64_t> fileSize(const String&);
</span><span class="cx"> WTF_EXPORT_PRIVATE Optional<uint64_t> fileSize(PlatformFileHandle);
</span><span class="cx"> WTF_EXPORT_PRIVATE Optional<WallTime> getFileModificationTime(const String&);
</span><ins>+WTF_EXPORT_PRIVATE bool updateFileModificationTime(const String& path); // Sets modification time to now.
</ins><span class="cx"> WTF_EXPORT_PRIVATE Optional<WallTime> getFileCreationTime(const String&); // Not all platforms store file creation time.
</span><span class="cx"> WTF_EXPORT_PRIVATE Optional<FileMetadata> fileMetadata(const String& path);
</span><span class="cx"> WTF_EXPORT_PRIVATE Optional<FileMetadata> fileMetadataFollowingSymlinks(const String& path);
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (277498 => 277499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-05-14 17:54:23 UTC (rev 277498)
+++ trunk/Source/WebKit/ChangeLog       2021-05-14 18:26:20 UTC (rev 277499)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-05-14  Chris Dumez  <cdumez@apple.com>
+
+        Introduce FileSystem::updateFileModificationTime()
+        https://bugs.webkit.org/show_bug.cgi?id=225810
+
+        Reviewed by Darin Adler.
+
+        Call the new FileSystem::updateFileModificationTime() API to modify the
+        file modification time instead of having low-level platform-specific
+        file system code at the WebKit2 layer.
+
+        * NetworkProcess/cache/NetworkCacheFileSystem.cpp:
+        (WebKit::NetworkCache::updateFileModificationTimeIfNeeded):
+
</ins><span class="cx"> 2021-05-14  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Resource Timing: secureConnectionStart == 0 when a connection is re-used
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcesscacheNetworkCacheFileSystemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp (277498 => 277499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp      2021-05-14 17:54:23 UTC (rev 277498)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp 2021-05-14 18:26:20 UTC (rev 277499)
</span><span class="lines">@@ -96,18 +96,7 @@
</span><span class="cx">         if (WallTime::now() - times.modification < 1_h)
</span><span class="cx">             return;
</span><span class="cx">     }
</span><del>-#if !OS(WINDOWS)
-    // This really updates both the access time and the modification time.
-    utimes(FileSystem::fileSystemRepresentation(path).data(), nullptr);
-#else
-    FILETIME time;
-    GetSystemTimeAsFileTime(&time);
-    auto file = CreateFile(path.wideCharacters().data(), GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
-    if (file == INVALID_HANDLE_VALUE)
-        return;
-    SetFileTime(file, &time, &time, &time);
-    CloseHandle(file);
-#endif
</del><ins>+    FileSystem::updateFileModificationTime(path);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (277498 => 277499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-05-14 17:54:23 UTC (rev 277498)
+++ trunk/Tools/ChangeLog       2021-05-14 18:26:20 UTC (rev 277499)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-05-14  Chris Dumez  <cdumez@apple.com>
+
+        Introduce FileSystem::updateFileModificationTime()
+        https://bugs.webkit.org/show_bug.cgi?id=225810
+
+        Reviewed by Darin Adler.
+
+        Add API test coverage.
+
+        * TestWebKitAPI/Tests/WTF/FileSystem.cpp:
+        (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2021-05-14  Jonathan Bedard  <jbedard@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [run-api-tests] Use Python 3 (Part 2)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFFileSystemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/FileSystem.cpp (277498 => 277499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/FileSystem.cpp       2021-05-14 17:54:23 UTC (rev 277498)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/FileSystem.cpp  2021-05-14 18:26:20 UTC (rev 277499)
</span><span class="lines">@@ -741,6 +741,27 @@
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+TEST_F(FileSystemTest, updateFileModificationTime)
+{
+    auto modificationTime = FileSystem::getFileModificationTime(tempFilePath());
+    ASSERT_TRUE(!!modificationTime);
+
+    unsigned timeout = 0;
+    while (*modificationTime >= WallTime::now() && ++timeout < 20)
+        TestWebKitAPI::Util::sleep(0.1);
+    EXPECT_LT(modificationTime->secondsSinceEpoch().value(), WallTime::now().secondsSinceEpoch().value());
+
+    TestWebKitAPI::Util::sleep(1);
+
+    EXPECT_TRUE(FileSystem::updateFileModificationTime(tempFilePath()));
+    auto newModificationTime = FileSystem::getFileModificationTime(tempFilePath());
+    ASSERT_TRUE(!!newModificationTime);
+    EXPECT_GT(newModificationTime->secondsSinceEpoch().value(), modificationTime->secondsSinceEpoch().value());
+
+    auto doesNotExistPath = FileSystem::pathByAppendingComponent(tempEmptyFolderPath(), "does-not-exist");
+    EXPECT_FALSE(FileSystem::updateFileModificationTime(doesNotExistPath));
+}
+
</ins><span class="cx"> TEST_F(FileSystemTest, pathFileName)
</span><span class="cx"> {
</span><span class="cx">     auto testPath = FileSystem::pathByAppendingComponents(tempEmptyFolderPath(), { "subfolder", "filename.txt" });
</span></span></pre>
</div>
</div>

</body>
</html>