Changeset 246395 in webkit
- Timestamp:
- Jun 12, 2019 10:57:09 PM (5 years ago)
- Location:
- trunk/Source
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WTF/ChangeLog
r246388 r246395 1 2019-06-12 Antoine Quint <graouts@apple.com> 2 3 Show the web page URL when sharing an AR model 4 https://bugs.webkit.org/show_bug.cgi?id=198812 5 <rdar://problem/48689498> 6 7 Reviewed by Dean Jackson. 8 9 * wtf/Platform.h: 10 1 11 2019-06-12 Youenn Fablet <youenn@apple.com> 2 12 -
trunk/Source/WTF/wtf/Platform.h
r246388 r246395 1527 1527 1528 1528 #if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000 1529 #define HAVE_ARKIT_QUICK_LOOK_PREVIEW_ITEM 1 1530 #endif 1531 1532 #if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000 1529 1533 #define HAVE_UI_WK_DOCUMENT_CONTEXT 1 1530 1534 #endif -
trunk/Source/WebCore/PAL/ChangeLog
r246285 r246395 1 2019-06-12 Antoine Quint <graouts@apple.com> 2 3 Show the web page URL when sharing an AR model 4 https://bugs.webkit.org/show_bug.cgi?id=198812 5 <rdar://problem/48689498> 6 7 Reviewed by Dean Jackson. 8 9 * pal/spi/ios/SystemPreviewSPI.h: 10 1 11 2019-06-10 Sam Weinig <weinig@apple.com> 2 12 -
trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h
r233266 r246395 26 26 #if USE(APPLE_INTERNAL_SDK) 27 27 28 #if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM) 29 #import <AssetViewer/ARQuickLookWebKitItem.h> 30 #endif 31 28 32 #import <AssetViewer/ASVThumbnailView.h> 29 33 … … 46 50 @end 47 51 52 #if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM) 53 #import <ARKit/ARKit.h> 54 55 @class ARQuickLookWebKitItem; 56 57 @interface ARQuickLookWebKitItem : QLItem 58 - (instancetype)initWithPreviewItemProvider:(NSItemProvider *_Nonnull)itemProvider contentType:(NSString *_Nonnull)contentType previewTitle:(NSString *_Nonnull)previewTitle fileSize:(NSNumber *_Nonnull)fileSize previewItem:(ARQuickLookPreviewItem *)previewItem; 59 @end 48 60 #endif 49 61 62 #endif 63 -
trunk/Source/WebKit/ChangeLog
r246392 r246395 1 2019-06-12 Antoine Quint <graouts@apple.com> 2 3 Show the web page URL when sharing an AR model 4 https://bugs.webkit.org/show_bug.cgi?id=198812 5 <rdar://problem/48689498> 6 7 Reviewed by Dean Jackson. 8 9 * UIProcess/Cocoa/DownloadClient.mm: 10 (WebKit::DownloadClient::didStart): 11 * UIProcess/Cocoa/SystemPreviewControllerCocoa.mm: 12 (-[_WKPreviewControllerDataSource initWithMIMEType:originatingPageURL:]): 13 (-[_WKPreviewControllerDataSource previewController:previewItemAtIndex:]): 14 (WebKit::SystemPreviewController::start): 15 (-[_WKPreviewControllerDataSource initWithMIMEType:]): Deleted. 16 * UIProcess/SystemPreviewController.h: 17 1 18 2019-06-12 Antti Koivisto <antti@apple.com> 2 19 -
trunk/Source/WebKit/UIProcess/Cocoa/DownloadClient.mm
r242339 r246395 72 72 if (auto* webPage = downloadProxy.originatingPage()) { 73 73 // FIXME: Update the MIME-type once it is known in the ResourceResponse. 74 webPage->systemPreviewController()->start( "application/octet-stream"_s, downloadProxy.systemPreviewDownloadRect());74 webPage->systemPreviewController()->start(URL(URL(), webPage->currentURL()), "application/octet-stream"_s, downloadProxy.systemPreviewDownloadRect()); 75 75 } 76 76 takeActivityToken(downloadProxy); -
trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm
r244201 r246395 40 40 #import <wtf/WeakObjCPtr.h> 41 41 42 #if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM) 43 #import <pal/spi/ios/SystemPreviewSPI.h> 44 SOFT_LINK_PRIVATE_FRAMEWORK(ARKit); 45 SOFT_LINK_CLASS(ARKit, ARQuickLookPreviewItem); 46 SOFT_LINK_PRIVATE_FRAMEWORK(AssetViewer); 47 SOFT_LINK_CLASS(AssetViewer, ARQuickLookWebKitItem); 48 #endif 49 42 50 @interface _WKPreviewControllerDataSource : NSObject <QLPreviewControllerDataSource> { 43 51 RetainPtr<NSItemProvider> _itemProvider; 52 #if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM) 53 RetainPtr<ARQuickLookWebKitItem> _item; 54 #else 44 55 RetainPtr<QLItem> _item; 56 #endif 57 URL _originatingPageURL; 45 58 URL _downloadedURL; 46 59 }; … … 53 66 @implementation _WKPreviewControllerDataSource 54 67 55 - (instancetype)initWithMIMEType:(NSString*)mimeType 68 - (instancetype)initWithMIMEType:(NSString*)mimeType originatingPageURL:(URL)url 56 69 { 57 70 if (!(self = [super init])) 58 71 return nil; 59 72 73 _originatingPageURL = url; 60 74 _mimeType = [mimeType copy]; 61 75 … … 85 99 NSString *contentType = WebCore::UTIFromMIMEType("model/vnd.usdz+zip"_s); 86 100 101 #if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM) 102 ARQuickLookPreviewItem *previewItem = [allocARQuickLookPreviewItemInstance() initWithFileAtURL:_downloadedURL]; 103 previewItem.canonicalWebPageURL = _originatingPageURL; 104 105 _item = [allocARQuickLookWebKitItemInstance() initWithPreviewItemProvider:_itemProvider.get() contentType:contentType previewTitle:@"Preview" fileSize:@(0) previewItem:previewItem]; 106 #else 87 107 _item = adoptNS([PAL::allocQLItemInstance() initWithPreviewItemProvider:_itemProvider.get() contentType:contentType previewTitle:@"Preview" fileSize:@(0)]); 108 #endif 88 109 [_item setUseLoadingTimeout:NO]; 89 110 … … 198 219 namespace WebKit { 199 220 200 void SystemPreviewController::start( const String& mimeType, const WebCore::IntRect& fromRect)221 void SystemPreviewController::start(URL originatingPageURL, const String& mimeType, const WebCore::IntRect& fromRect) 201 222 { 202 223 ASSERT(!m_qlPreviewController); … … 214 235 [m_qlPreviewController setDelegate:m_qlPreviewControllerDelegate.get()]; 215 236 216 m_qlPreviewControllerDataSource = adoptNS([[_WKPreviewControllerDataSource alloc] initWithMIMEType:mimeType ]);237 m_qlPreviewControllerDataSource = adoptNS([[_WKPreviewControllerDataSource alloc] initWithMIMEType:mimeType originatingPageURL:originatingPageURL]); 217 238 [m_qlPreviewController setDataSource:m_qlPreviewControllerDataSource.get()]; 218 239 -
trunk/Source/WebKit/UIProcess/SystemPreviewController.h
r238771 r246395 49 49 bool canPreview(const String& mimeType) const; 50 50 51 void start( const String& mimeType, const WebCore::IntRect&);51 void start(URL originatingPageURL, const String& mimeType, const WebCore::IntRect&); 52 52 void updateProgress(float); 53 53 void finish(URL);
Note: See TracChangeset
for help on using the changeset viewer.