Changeset 231825 in webkit

Timestamp:

May 15, 2018 5:39:10 PM (6 years ago)

Author:

dino@apple.com

Message:

Launch System Preview as the download starts, rather than waiting for a response
​https://bugs.webkit.org/show_bug.cgi?id=185669
<rdar://problem/40278181>

Reviewed by Tim Horton.

We were waiting for the RequestResponse to get a MIME-type before
launching the system preview. This causes an annoying delay.

Instead, assume that the system preview is one of the handled
mime types and launch the viewer immediately. If it gets something it
didn't expect, it will show an error.

• UIProcess/Cocoa/DownloadClient.mm:

(WebKit::DownloadClient::didStart):
(WebKit::DownloadClient::didReceiveResponse):

• UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:

(-[_WKPreviewControllerDataSource previewController:previewItemAtIndex:]):
(WebKit::SystemPreviewController::start): Small cleanup to ensure we
don't try to present twice (this shouldn't happen).

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/DownloadClient.mm (modified) (2 diffs)
• UIProcess/Cocoa/SystemPreviewControllerCocoa.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-05-15  Dean Jackson  <dino@apple.com>
+
+        Launch System Preview as the download starts, rather than waiting for a response
+        https://bugs.webkit.org/show_bug.cgi?id=185669
+        <rdar://problem/40278181>
+
+        Reviewed by Tim Horton.
+
+        We were waiting for the RequestResponse to get a MIME-type before
+        launching the system preview. This causes an annoying delay.
+
+        Instead, assume that the system preview is one of the handled
+        mime types and launch the viewer immediately. If it gets something it
+        didn't expect, it will show an error.
+
+        * UIProcess/Cocoa/DownloadClient.mm:
+        (WebKit::DownloadClient::didStart):
+        (WebKit::DownloadClient::didReceiveResponse):
+        * UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
+        (-[_WKPreviewControllerDataSource previewController:previewItemAtIndex:]):
+        (WebKit::SystemPreviewController::start): Small cleanup to ensure we
+        don't try to present twice (this shouldn't happen).
+
 2018-05-15  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/DownloadClient.mm

@@ -77 +77 @@
 #if USE(SYSTEM_PREVIEW)
     if (downloadProxy.isSystemPreviewDownload()) {
+        if (auto* webPage = downloadProxy.originatingPage()) {
+            // FIXME: Update the MIME-type once it is known in the ResourceResponse.
+            webPage->systemPreviewController()->start(ASCIILiteral { "application/octet-stream" });
+        }
         takeActivityToken(downloadProxy);
         return;
@@ -92 +96 @@
         downloadProxy.setExpectedContentLength(response.expectedContentLength());
         downloadProxy.setBytesLoaded(0);
-        if (auto* webPage = downloadProxy.originatingPage()) {
-            webPage->systemPreviewController()->start(response.mimeType());
+        if (auto* webPage = downloadProxy.originatingPage())
             webPage->systemPreviewController()->updateProgress(0);
-        }
         return;
     }

trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm

@@ -81 +81 @@
     NSString *contentType = @"public.content";
 #if USE(APPLE_INTERNAL_SDK)
-    contentType = WebKit::getUTIForMIMEType(self.mimeType);
+    // FIXME: We are launching the preview controller before getting a response from the resource, which
+    // means we don't actually know the real MIME type yet. Assume it is one of those that we registered.
+    contentType = WebKit::getUTIForMIMEType(*WebKit::getSystemPreviewMIMETypes().begin());
 #endif
     _item = adoptNS([allocQLItemInstance() initWithPreviewItemProvider:_itemProvider.get() contentType:contentType previewTitle:@"Preview" fileSize:@(0)]);
@@ -159 +161 @@
 void SystemPreviewController::start(const String& mimeType)
 {
-    // FIXME: Make sure you can't show a preview if we're already previewing.
+    ASSERT(!m_qlPreviewController);
+    if (m_qlPreviewController)
+        return;
 
     UIViewController *presentingViewController = m_webPageProxy.uiClient().presentingViewController();
@@ -166 +170 @@
         return;
 
-    if (!m_qlPreviewController) {
-        m_qlPreviewController = adoptNS([allocQLPreviewControllerInstance() init]);
-
-        m_qlPreviewControllerDelegate = adoptNS([[_WKPreviewControllerDelegate alloc] initWithSystemPreviewController:this]);
-        [m_qlPreviewController setDelegate:m_qlPreviewControllerDelegate.get()];
-
-        m_qlPreviewControllerDataSource = adoptNS([[_WKPreviewControllerDataSource alloc] initWithMIMEType:mimeType]);
-        [m_qlPreviewController setDataSource:m_qlPreviewControllerDataSource.get()];
-
-    }
+    m_qlPreviewController = adoptNS([allocQLPreviewControllerInstance() init]);
+
+    m_qlPreviewControllerDelegate = adoptNS([[_WKPreviewControllerDelegate alloc] initWithSystemPreviewController:this]);
+    [m_qlPreviewController setDelegate:m_qlPreviewControllerDelegate.get()];
+
+    m_qlPreviewControllerDataSource = adoptNS([[_WKPreviewControllerDataSource alloc] initWithMIMEType:mimeType]);
+    [m_qlPreviewController setDataSource:m_qlPreviewControllerDataSource.get()];
 
     [presentingViewController presentViewController:m_qlPreviewController.get() animated:YES completion:nullptr];