Show the web page URL when sharing an AR model
https://bugs.webkit.org/show_bug.cgi?id=198812
<rdar://problem/48689498>
Reviewed by Dean Jackson.
Source/WebCore/PAL:
* pal/spi/ios/SystemPreviewSPI.h:
Source/WebKit:
* UIProcess/Cocoa/DownloadClient.mm:
(WebKit::DownloadClient::didStart):
* UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
(-[_WKPreviewControllerDataSource initWithMIMEType:originatingPageURL:]):
(-[_WKPreviewControllerDataSource previewController:previewItemAtIndex:]):
(WebKit::SystemPreviewController::start):
(-[_WKPreviewControllerDataSource initWithMIMEType:]): Deleted.
* UIProcess/SystemPreviewController.h:
Source/WTF:
* wtf/Platform.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@246395 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 72eea33..edf2cef 100644
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,13 @@
+2019-06-12 Antoine Quint <graouts@apple.com>
+
+ Show the web page URL when sharing an AR model
+ https://bugs.webkit.org/show_bug.cgi?id=198812
+ <rdar://problem/48689498>
+
+ Reviewed by Dean Jackson.
+
+ * wtf/Platform.h:
+
2019-06-12 Youenn Fablet <youenn@apple.com>
Use NSURLSession for WebSocket
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 9d43bff..d56b0b2 100644
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -1526,6 +1526,10 @@
#endif
#if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
+#define HAVE_ARKIT_QUICK_LOOK_PREVIEW_ITEM 1
+#endif
+
+#if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
#define HAVE_UI_WK_DOCUMENT_CONTEXT 1
#endif
diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
index 96691b2..7d873f5 100644
--- a/Source/WebCore/PAL/ChangeLog
+++ b/Source/WebCore/PAL/ChangeLog
@@ -1,3 +1,13 @@
+2019-06-12 Antoine Quint <graouts@apple.com>
+
+ Show the web page URL when sharing an AR model
+ https://bugs.webkit.org/show_bug.cgi?id=198812
+ <rdar://problem/48689498>
+
+ Reviewed by Dean Jackson.
+
+ * pal/spi/ios/SystemPreviewSPI.h:
+
2019-06-10 Sam Weinig <weinig@apple.com>
Remove Dashboard support
diff --git a/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h b/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h
index 39e7518..bec7f90 100644
--- a/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h
+++ b/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h
@@ -25,6 +25,10 @@
#if USE(APPLE_INTERNAL_SDK)
+#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#import <AssetViewer/ARQuickLookWebKitItem.h>
+#endif
+
#import <AssetViewer/ASVThumbnailView.h>
#else
@@ -45,5 +49,15 @@
@property (nonatomic) CGSize maxThumbnailSize;
@end
+#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#import <ARKit/ARKit.h>
+
+@class ARQuickLookWebKitItem;
+
+@interface ARQuickLookWebKitItem : QLItem
+- (instancetype)initWithPreviewItemProvider:(NSItemProvider *_Nonnull)itemProvider contentType:(NSString *_Nonnull)contentType previewTitle:(NSString *_Nonnull)previewTitle fileSize:(NSNumber *_Nonnull)fileSize previewItem:(ARQuickLookPreviewItem *)previewItem;
+@end
+#endif
+
#endif
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index c2540a3..0d99009 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2019-06-12 Antoine Quint <graouts@apple.com>
+
+ Show the web page URL when sharing an AR model
+ https://bugs.webkit.org/show_bug.cgi?id=198812
+ <rdar://problem/48689498>
+
+ Reviewed by Dean Jackson.
+
+ * UIProcess/Cocoa/DownloadClient.mm:
+ (WebKit::DownloadClient::didStart):
+ * UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
+ (-[_WKPreviewControllerDataSource initWithMIMEType:originatingPageURL:]):
+ (-[_WKPreviewControllerDataSource previewController:previewItemAtIndex:]):
+ (WebKit::SystemPreviewController::start):
+ (-[_WKPreviewControllerDataSource initWithMIMEType:]): Deleted.
+ * UIProcess/SystemPreviewController.h:
+
2019-06-12 Antti Koivisto <antti@apple.com>
Try to fix iOS build.
diff --git a/Source/WebKit/UIProcess/Cocoa/DownloadClient.mm b/Source/WebKit/UIProcess/Cocoa/DownloadClient.mm
index a640f98..36ede72 100644
--- a/Source/WebKit/UIProcess/Cocoa/DownloadClient.mm
+++ b/Source/WebKit/UIProcess/Cocoa/DownloadClient.mm
@@ -71,7 +71,7 @@
if (downloadProxy.isSystemPreviewDownload()) {
if (auto* webPage = downloadProxy.originatingPage()) {
// FIXME: Update the MIME-type once it is known in the ResourceResponse.
- webPage->systemPreviewController()->start("application/octet-stream"_s, downloadProxy.systemPreviewDownloadRect());
+ webPage->systemPreviewController()->start(URL(URL(), webPage->currentURL()), "application/octet-stream"_s, downloadProxy.systemPreviewDownloadRect());
}
takeActivityToken(downloadProxy);
return;
diff --git a/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm b/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm
index 58834e9..8e01cc5 100644
--- a/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm
+++ b/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm
@@ -39,9 +39,22 @@
#import <pal/spi/ios/QuickLookSPI.h>
#import <wtf/WeakObjCPtr.h>
+#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#import <pal/spi/ios/SystemPreviewSPI.h>
+SOFT_LINK_PRIVATE_FRAMEWORK(ARKit);
+SOFT_LINK_CLASS(ARKit, ARQuickLookPreviewItem);
+SOFT_LINK_PRIVATE_FRAMEWORK(AssetViewer);
+SOFT_LINK_CLASS(AssetViewer, ARQuickLookWebKitItem);
+#endif
+
@interface _WKPreviewControllerDataSource : NSObject <QLPreviewControllerDataSource> {
RetainPtr<NSItemProvider> _itemProvider;
+#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+ RetainPtr<ARQuickLookWebKitItem> _item;
+#else
RetainPtr<QLItem> _item;
+#endif
+ URL _originatingPageURL;
URL _downloadedURL;
};
@@ -52,11 +65,12 @@
@implementation _WKPreviewControllerDataSource
-- (instancetype)initWithMIMEType:(NSString*)mimeType
+- (instancetype)initWithMIMEType:(NSString*)mimeType originatingPageURL:(URL)url
{
if (!(self = [super init]))
return nil;
+ _originatingPageURL = url;
_mimeType = [mimeType copy];
return self;
@@ -84,7 +98,14 @@
// means we don't actually know the real MIME type yet.
NSString *contentType = WebCore::UTIFromMIMEType("model/vnd.usdz+zip"_s);
+#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+ ARQuickLookPreviewItem *previewItem = [allocARQuickLookPreviewItemInstance() initWithFileAtURL:_downloadedURL];
+ previewItem.canonicalWebPageURL = _originatingPageURL;
+
+ _item = [allocARQuickLookWebKitItemInstance() initWithPreviewItemProvider:_itemProvider.get() contentType:contentType previewTitle:@"Preview" fileSize:@(0) previewItem:previewItem];
+#else
_item = adoptNS([PAL::allocQLItemInstance() initWithPreviewItemProvider:_itemProvider.get() contentType:contentType previewTitle:@"Preview" fileSize:@(0)]);
+#endif
[_item setUseLoadingTimeout:NO];
WeakObjCPtr<_WKPreviewControllerDataSource> weakSelf { self };
@@ -197,7 +218,7 @@
namespace WebKit {
-void SystemPreviewController::start(const String& mimeType, const WebCore::IntRect& fromRect)
+void SystemPreviewController::start(URL originatingPageURL, const String& mimeType, const WebCore::IntRect& fromRect)
{
ASSERT(!m_qlPreviewController);
if (m_qlPreviewController)
@@ -213,7 +234,7 @@
m_qlPreviewControllerDelegate = adoptNS([[_WKPreviewControllerDelegate alloc] initWithSystemPreviewController:this fromRect:fromRect]);
[m_qlPreviewController setDelegate:m_qlPreviewControllerDelegate.get()];
- m_qlPreviewControllerDataSource = adoptNS([[_WKPreviewControllerDataSource alloc] initWithMIMEType:mimeType]);
+ m_qlPreviewControllerDataSource = adoptNS([[_WKPreviewControllerDataSource alloc] initWithMIMEType:mimeType originatingPageURL:originatingPageURL]);
[m_qlPreviewController setDataSource:m_qlPreviewControllerDataSource.get()];
[presentingViewController presentViewController:m_qlPreviewController.get() animated:YES completion:nullptr];
diff --git a/Source/WebKit/UIProcess/SystemPreviewController.h b/Source/WebKit/UIProcess/SystemPreviewController.h
index 269d0c3..f261f52 100644
--- a/Source/WebKit/UIProcess/SystemPreviewController.h
+++ b/Source/WebKit/UIProcess/SystemPreviewController.h
@@ -48,7 +48,7 @@
bool canPreview(const String& mimeType) const;
- void start(const String& mimeType, const WebCore::IntRect&);
+ void start(URL originatingPageURL, const String& mimeType, const WebCore::IntRect&);
void updateProgress(float);
void finish(URL);
void cancel();
