Title: [285319] trunk/Source
- Revision
- 285319
- Author
- [email protected]
- Date
- 2021-11-04 16:29:58 -0700 (Thu, 04 Nov 2021)
Log Message
REGRESSION: AR Quicklook asset is shared instead of page URL
https://bugs.webkit.org/show_bug.cgi?id=232674
rdar://84220997
Reviewed by Antoine Quint.
There was a typo. ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
should be HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM).
Source/WebCore/PAL:
* pal/spi/ios/SystemPreviewSPI.h:
Source/WebKit:
* UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (285318 => 285319)
--- trunk/Source/WebCore/PAL/ChangeLog 2021-11-04 23:18:23 UTC (rev 285318)
+++ trunk/Source/WebCore/PAL/ChangeLog 2021-11-04 23:29:58 UTC (rev 285319)
@@ -1,3 +1,16 @@
+2021-11-04 Dean Jackson <[email protected]>
+
+ REGRESSION: AR Quicklook asset is shared instead of page URL
+ https://bugs.webkit.org/show_bug.cgi?id=232674
+ rdar://84220997
+
+ Reviewed by Antoine Quint.
+
+ There was a typo. ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+ should be HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM).
+
+ * pal/spi/ios/SystemPreviewSPI.h:
+
2021-11-04 Myles C. Maxfield <[email protected]>
[Cocoa] Migrate from CTFontCopyVariationAxes() to CTFontCopyVariationAxesInternal() if possible
Modified: trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h (285318 => 285319)
--- trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h 2021-11-04 23:18:23 UTC (rev 285318)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h 2021-11-04 23:29:58 UTC (rev 285319)
@@ -25,7 +25,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
#import <AssetViewer/ARQuickLookWebKitItem.h>
#endif
@@ -42,8 +42,9 @@
#import <UIKit/UIKit.h>
#if PLATFORM(IOS)
+#import <pal/spi/ios/QuickLookSPI.h>
+
@class ASVThumbnailView;
-@class QLItem;
@class QLPreviewController;
NS_ASSUME_NONNULL_BEGIN
@@ -59,9 +60,13 @@
@end
#endif
-#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+NS_ASSUME_NONNULL_END
+
+#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
#import <ARKit/ARKit.h>
+NS_ASSUME_NONNULL_BEGIN
+
@protocol ARQuickLookWebKitItemDelegate
@end
Modified: trunk/Source/WebKit/ChangeLog (285318 => 285319)
--- trunk/Source/WebKit/ChangeLog 2021-11-04 23:18:23 UTC (rev 285318)
+++ trunk/Source/WebKit/ChangeLog 2021-11-04 23:29:58 UTC (rev 285319)
@@ -1,3 +1,16 @@
+2021-11-04 Dean Jackson <[email protected]>
+
+ REGRESSION: AR Quicklook asset is shared instead of page URL
+ https://bugs.webkit.org/show_bug.cgi?id=232674
+ rdar://84220997
+
+ Reviewed by Antoine Quint.
+
+ There was a typo. ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+ should be HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM).
+
+ * UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
+
2021-11-04 Nikolaos Mouchtaris <[email protected]>
Make scrollbar orientation an enum class
Modified: trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm (285318 => 285319)
--- trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm 2021-11-04 23:18:23 UTC (rev 285318)
+++ trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm 2021-11-04 23:29:58 UTC (rev 285319)
@@ -39,7 +39,7 @@
#import <pal/spi/ios/QuickLookSPI.h>
#import <wtf/WeakObjCPtr.h>
-#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
#import <pal/spi/ios/SystemPreviewSPI.h>
SOFT_LINK_PRIVATE_FRAMEWORK(ARKit);
SOFT_LINK_CLASS(ARKit, ARQuickLookPreviewItem);
@@ -57,7 +57,7 @@
@interface _WKPreviewControllerDataSource : NSObject <QLPreviewControllerDataSource> {
#endif
RetainPtr<NSItemProvider> _itemProvider;
-#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
RetainPtr<ARQuickLookWebKitItem> _item;
#else
RetainPtr<QLItem> _item;
@@ -108,7 +108,7 @@
// means we don't actually know the real MIME type yet.
NSString *contentType = WebCore::UTIFromMIMEType("model/vnd.usdz+zip"_s);
-#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
auto previewItem = adoptNS([allocARQuickLookPreviewItemInstance() initWithFileAtURL:_downloadedURL]);
[previewItem setCanonicalWebPageURL:_originatingPageURL];
@@ -159,7 +159,7 @@
self.completionHandler(nil, error);
}
-#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
- (void)previewItem:(ARQuickLookWebKitItem *)previewItem didReceiveMessage:(NSDictionary *)message
{
if (!_previewController)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
