Title: [229580] trunk/Source/WebCore/PAL
Revision
229580
Author
d...@apple.com
Date
2018-03-13 11:28:11 -0700 (Tue, 13 Mar 2018)

Log Message

Fix some build errors and cleanup QuickLookSPI.h
https://bugs.webkit.org/show_bug.cgi?id=183599

Reviewed by Ryan Haddad.

* pal/spi/ios/QuickLookSPI.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/PAL/ChangeLog (229579 => 229580)


--- trunk/Source/WebCore/PAL/ChangeLog	2018-03-13 18:07:30 UTC (rev 229579)
+++ trunk/Source/WebCore/PAL/ChangeLog	2018-03-13 18:28:11 UTC (rev 229580)
@@ -1,3 +1,12 @@
+2018-03-13  Dean Jackson  <d...@apple.com>
+
+        Fix some build errors and cleanup QuickLookSPI.h
+        https://bugs.webkit.org/show_bug.cgi?id=183599
+
+        Reviewed by Ryan Haddad.
+
+        * pal/spi/ios/QuickLookSPI.h:
+
 2018-03-12  Dean Jackson  <d...@apple.com>
 
         Add a WKWebViewContentProvider for system previews

Modified: trunk/Source/WebCore/PAL/pal/spi/ios/QuickLookSPI.h (229579 => 229580)


--- trunk/Source/WebCore/PAL/pal/spi/ios/QuickLookSPI.h	2018-03-13 18:07:30 UTC (rev 229579)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/QuickLookSPI.h	2018-03-13 18:28:11 UTC (rev 229580)
@@ -34,9 +34,6 @@
 @interface QLPreviewConverter : NSObject
 @end
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnullability-completeness"
-
 @interface QLPreviewConverter ()
 - (NSURLRequest *)safeRequestForRequest:(NSURLRequest *)request;
 - (id)initWithConnection:(NSURLConnection *)connection delegate:(id)delegate response:(NSURLResponse *)response options:(NSDictionary *)options;
@@ -57,24 +54,14 @@
 @end
 
 @interface QLItem : NSObject
-- (instancetype)initWithDataProvider:(id<QLPreviewItemDataProvider> _Nonnull)data contentType:(NSString *_Nonnull)contentType previewTitle:(NSString *_Nonnull)previewTitle;
+- (instancetype)initWithDataProvider:(id<QLPreviewItemDataProvider>)data contentType:(NSString *)contentType previewTitle:(NSString *)previewTitle;
 @end
 
-
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
 #define kQLReturnPasswordProtected 1 << 2
-#else
-#define kQLReturnMask 0xaf00
-#define kQLReturnPasswordProtected (kQLReturnMask | 20)
-#endif
 
 #endif
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
 static_assert(kQLReturnPasswordProtected == 4, "kQLReturnPasswordProtected should equal 4.");
-#else
-static_assert(kQLReturnPasswordProtected == 44820, "kQLReturnPasswordProtected should equal 44820.");
-#endif
 
 WTF_EXTERN_C_BEGIN
 
@@ -84,5 +71,3 @@
 NSString *QLTypeCopyUTIForURLAndMimeType(NSURL *, NSString *mimeType);
 
 WTF_EXTERN_C_END
-
-#pragma clang diagnostic pop
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to