<!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>[280875] trunk/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/280875">280875</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-08-10 17:12:16 -0700 (Tue, 10 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>WebKitBlobResource error 1 exactly after 60 seconds when trying to read file input
https://bugs.webkit.org/show_bug.cgi?id=228683
<rdar://78448610>

Patch by Alex Christensen <achristensen@webkit.org> on 2021-08-10
Reviewed by Tim Horton.

To prevent UIKit from deleting our files to upload after 60 seconds, copy them to a temporary directory,
then delete the files when cleaning up the WKContentView.

I manually verified this makes the files able to upload after more than 60 seconds, then deletes them when you close the tab.

* UIProcess/ios/WKContentView.h:
* UIProcess/ios/WKContentView.mm:
(-[WKContentView dealloc]):
(-[WKContentView _removeTemporaryFilesIfNecessary]):
(-[WKContentView _removeTemporaryFilesWhenDeallocated:]):
* UIProcess/ios/WKContentViewInteraction.h.orig: Added.
* UIProcess/ios/WKContentViewInteraction.mm.orig: Added.
* UIProcess/ios/forms/WKFileUploadPanel.mm:
(-[WKFileUploadPanel documentPicker:didPickDocumentsAtURLs:]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewh">trunk/Source/WebKit/UIProcess/ios/WKContentView.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewmm">trunk/Source/WebKit/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosformsWKFileUploadPanelmm">trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (280874 => 280875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-08-11 00:00:50 UTC (rev 280874)
+++ trunk/Source/WebKit/ChangeLog       2021-08-11 00:12:16 UTC (rev 280875)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2021-08-10  Alex Christensen  <achristensen@webkit.org>
+
+        WebKitBlobResource error 1 exactly after 60 seconds when trying to read file input
+        https://bugs.webkit.org/show_bug.cgi?id=228683
+        <rdar://78448610>
+
+        Reviewed by Tim Horton.
+
+        To prevent UIKit from deleting our files to upload after 60 seconds, copy them to a temporary directory,
+        then delete the files when cleaning up the WKContentView.
+
+        I manually verified this makes the files able to upload after more than 60 seconds, then deletes them when you close the tab.
+
+        * UIProcess/ios/WKContentView.h:
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView dealloc]):
+        (-[WKContentView _removeTemporaryFilesIfNecessary]):
+        (-[WKContentView _removeTemporaryFilesWhenDeallocated:]):
+        * UIProcess/ios/WKContentViewInteraction.h.orig: Added.
+        * UIProcess/ios/WKContentViewInteraction.mm.orig: Added.
+        * UIProcess/ios/forms/WKFileUploadPanel.mm:
+        (-[WKFileUploadPanel documentPicker:didPickDocumentsAtURLs:]):
+
</ins><span class="cx"> 2021-08-10  Andres Gonzalez  <andresg_22@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Notify accessibility that WebProcess is suspended when in process cache.
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentView.h (280874 => 280875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentView.h        2021-08-11 00:00:50 UTC (rev 280874)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentView.h   2021-08-11 00:12:16 UTC (rev 280875)
</span><span class="lines">@@ -112,6 +112,7 @@
</span><span class="cx"> #endif // HAVE(VISIBILITY_PROPAGATION_VIEW)
</span><span class="cx"> 
</span><span class="cx"> - (void)_setAcceleratedCompositingRootView:(UIView *)rootView;
</span><ins>+- (void)_removeTemporaryDirectoriesWhenDeallocated:(Vector<RetainPtr<NSURL>>&&)urls;
</ins><span class="cx"> 
</span><span class="cx"> - (void)_showInspectorHighlight:(const WebCore::InspectorOverlay::Highlight&)highlight;
</span><span class="cx"> - (void)_hideInspectorHighlight;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentView.mm (280874 => 280875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentView.mm       2021-08-11 00:00:50 UTC (rev 280874)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentView.mm  2021-08-11 00:12:16 UTC (rev 280875)
</span><span class="lines">@@ -149,6 +149,7 @@
</span><span class="cx"> 
</span><span class="cx">     uint64_t _pdfPrintCallbackID;
</span><span class="cx">     RetainPtr<CGPDFDocumentRef> _printedDocument;
</span><ins>+    Vector<RetainPtr<NSURL>> _temporaryURLsToDeleteWhenDeallocated;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if USE(UIKIT_KEYBOARD_ADDITIONS)
</span><span class="lines">@@ -313,9 +314,42 @@
</span><span class="cx"> 
</span><span class="cx">     WebKit::WebProcessPool::statistics().wkViewCount--;
</span><span class="cx"> 
</span><ins>+    [self _removeTemporaryFilesIfNecessary];
+    
</ins><span class="cx">     [super dealloc];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (void)_removeTemporaryFilesIfNecessary
+{
+    if (_temporaryURLsToDeleteWhenDeallocated.isEmpty())
+        return;
+    
+    auto deleteTemporaryFiles = makeBlockPtr([urls = std::exchange(_temporaryURLsToDeleteWhenDeallocated, { })] {
+        ASSERT(!RunLoop::isMain());
+        auto manager = adoptNS([[NSFileManager alloc] init]);
+        auto coordinator = adoptNS([[NSFileCoordinator alloc] init]);
+        for (auto& url : urls) {
+            if (![manager fileExistsAtPath:[url path]])
+                continue;
+            NSError *error = nil;
+            [coordinator coordinateWritingItemAtURL:url.get() options:NSFileCoordinatorWritingForDeleting error:&error byAccessor:^(NSURL *coordinatedURL) {
+                NSError *error = nil;
+                if (![manager removeItemAtURL:coordinatedURL error:&error] || error)
+                    LOG_ERROR(OS_LOG_DEFAULT, "WKContentViewInteraction failed to remove file at path %@ with error %@", coordinatedURL.path, error);
+            }];
+            if (error)
+                LOG_ERROR(OS_LOG_DEFAULT, "WKContentViewInteraction failed to coordinate removal of temporary file at path %@ with error %@", url, error);
+        }
+    });
+
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), deleteTemporaryFiles.get());
+}
+
+- (void)_removeTemporaryDirectoriesWhenDeallocated:(Vector<RetainPtr<NSURL>>&&)urls
+{
+    _temporaryURLsToDeleteWhenDeallocated.appendVector(WTFMove(urls));
+}
+
</ins><span class="cx"> - (WebKit::WebPageProxy*)page
</span><span class="cx"> {
</span><span class="cx">     return _page.get();
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosformsWKFileUploadPanelmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm (280874 => 280875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm     2021-08-11 00:00:50 UTC (rev 280874)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm        2021-08-11 00:12:16 UTC (rev 280875)
</span><span class="lines">@@ -648,11 +648,55 @@
</span><span class="cx">     return WebCore::multipleFileUploadText(urlsCount);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls
</del><ins>+
+- (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentsAtURLs:(NSArray<NSURL *> *)urlsFromUIKit
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(urls.count);
</span><span class="cx">     [self _dismissDisplayAnimated:YES];
</span><del>-    [self _chooseFiles:urls displayString:displayStringForDocumentsAtURLs(urls) iconImage:iconForFile(urls[0]).get()];
</del><ins>+
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), makeBlockPtr([retainedSelf = retainPtr(self), urlsFromUIKit = retainPtr(urlsFromUIKit)] () mutable {
+
+        auto copyToNewTemporaryDirectory = [] (NSArray<NSURL *> *originalURLs) -> std::pair<RetainPtr<NSArray<NSURL *>>, Vector<RetainPtr<NSURL>>> {
+            ASSERT(!RunLoop::isMain());
+            auto maybeMovedURLs = adoptNS([[NSMutableArray alloc] initWithCapacity:originalURLs.count]);
+            __block Vector<RetainPtr<NSURL>> temporaryURLs;
+            auto manager = adoptNS([[NSFileManager alloc] init]);
+            auto coordinator = adoptNS([[NSFileCoordinator alloc] init]);
+            for (NSURL *originalURL in originalURLs) {
+                NSError *error = nil;
+                NSString *temporaryDirectory = FileSystem::createTemporaryDirectory(@"WKFileUploadPanel");
+                if (!temporaryDirectory) {
+                    LOG_ERROR("WKFileUploadPanel: Failed to make temporary directory");
+                    [maybeMovedURLs addObject:originalURL];
+                    continue;
+                }
+                NSString *filePath = [temporaryDirectory stringByAppendingPathComponent:originalURL.lastPathComponent];
+                auto destinationFileURL = adoptNS([[NSURL alloc] initFileURLWithPath:filePath isDirectory:NO]);
+                [coordinator coordinateWritingItemAtURL:originalURL options:NSFileCoordinatorWritingForMoving error:&error byAccessor:^(NSURL *coordinatedOriginalURL) {
+                    NSError *error = nil;
+                    if (![manager moveItemAtURL:coordinatedOriginalURL toURL:destinationFileURL.get() error:&error] || error) {
+                        LOG_ERROR("WKFileUploadPanel: Failed to move file to new path %@ with error %@", destinationFileURL.get(), error);
+                        // If moving fails, keep the original URL and our 60 second time limit before it is deleted. We tried our best to extend it.
+                        [maybeMovedURLs addObject:coordinatedOriginalURL];
+                    } else
+                        [maybeMovedURLs addObject:destinationFileURL.get()];
+                }];
+                if (error) {
+                    LOG_ERROR("WKFileUploadPanel: Failed to coordinate moving file with error %@", error);
+                    // If moving fails, keep the original URL and our 60 second time limit before it is deleted. We tried our best to extend it.
+                    [maybeMovedURLs addObject:originalURL];
+                }
+                temporaryURLs.append(adoptNS([[NSURL alloc] initFileURLWithPath:temporaryDirectory isDirectory:YES]));
+            }
+            return { WTFMove(maybeMovedURLs), WTFMove(temporaryURLs) };
+        };
+
+        auto [maybeMovedURLs, temporaryURLs] = copyToNewTemporaryDirectory(urlsFromUIKit.get());
+        [retainedSelf->_view _removeTemporaryDirectoriesWhenDeallocated:WTFMove(temporaryURLs)];
+        RunLoop::main().dispatch([retainedSelf = WTFMove(retainedSelf), maybeMovedURLs = WTFMove(maybeMovedURLs)] {
+            [retainedSelf _chooseFiles:maybeMovedURLs.get() displayString:displayStringForDocumentsAtURLs(maybeMovedURLs.get()) iconImage:iconForFile(maybeMovedURLs.get()[0]).get()];
+        });
+    }).get());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)documentPickerWasCancelled:(UIDocumentPickerViewController *)documentPicker
</span></span></pre>
</div>
</div>

</body>
</html>