Title: [285257] trunk/Source
- Revision
- 285257
- Author
- [email protected]
- Date
- 2021-11-04 02:31:00 -0700 (Thu, 04 Nov 2021)
Log Message
Unreviewed, reverting r285228.
https://bugs.webkit.org/show_bug.cgi?id=232704
Broke iOS builds
Reverted changeset:
"REGRESSION: AR Quicklook asset is shared instead of page URL"
https://bugs.webkit.org/show_bug.cgi?id=232674
https://commits.webkit.org/r285228
Modified Paths
Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (285256 => 285257)
--- trunk/Source/WebCore/PAL/ChangeLog 2021-11-04 08:57:49 UTC (rev 285256)
+++ trunk/Source/WebCore/PAL/ChangeLog 2021-11-04 09:31:00 UTC (rev 285257)
@@ -1,3 +1,16 @@
+2021-11-04 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r285228.
+ https://bugs.webkit.org/show_bug.cgi?id=232704
+
+ Broke iOS builds
+
+ Reverted changeset:
+
+ "REGRESSION: AR Quicklook asset is shared instead of page URL"
+ https://bugs.webkit.org/show_bug.cgi?id=232674
+ https://commits.webkit.org/r285228
+
2021-11-03 Dean Jackson <[email protected]>
REGRESSION: AR Quicklook asset is shared instead of page URL
Modified: trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h (285256 => 285257)
--- trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h 2021-11-04 08:57:49 UTC (rev 285256)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h 2021-11-04 09:31:00 UTC (rev 285257)
@@ -25,7 +25,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
#import <AssetViewer/ARQuickLookWebKitItem.h>
#endif
@@ -59,13 +59,9 @@
@end
#endif
-NS_ASSUME_NONNULL_END
-
-#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
#import <ARKit/ARKit.h>
-NS_ASSUME_NONNULL_BEGIN
-
@protocol ARQuickLookWebKitItemDelegate
@end
Modified: trunk/Source/WebKit/ChangeLog (285256 => 285257)
--- trunk/Source/WebKit/ChangeLog 2021-11-04 08:57:49 UTC (rev 285256)
+++ trunk/Source/WebKit/ChangeLog 2021-11-04 09:31:00 UTC (rev 285257)
@@ -1,3 +1,16 @@
+2021-11-04 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r285228.
+ https://bugs.webkit.org/show_bug.cgi?id=232704
+
+ Broke iOS builds
+
+ Reverted changeset:
+
+ "REGRESSION: AR Quicklook asset is shared instead of page URL"
+ https://bugs.webkit.org/show_bug.cgi?id=232674
+ https://commits.webkit.org/r285228
+
2021-11-03 Jer Noble <[email protected]>
[macOS] MediaSession coordinator enabled in UIProcess, disabled in WebContent
Modified: trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm (285256 => 285257)
--- trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm 2021-11-04 08:57:49 UTC (rev 285256)
+++ trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm 2021-11-04 09:31:00 UTC (rev 285257)
@@ -39,7 +39,7 @@
#import <pal/spi/ios/QuickLookSPI.h>
#import <wtf/WeakObjCPtr.h>
-#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if ENABLE(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 HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if ENABLE(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 HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
auto previewItem = adoptNS([allocARQuickLookPreviewItemInstance() initWithFileAtURL:_downloadedURL]);
[previewItem setCanonicalWebPageURL:_originatingPageURL];
@@ -159,7 +159,7 @@
self.completionHandler(nil, error);
}
-#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if ENABLE(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
