Diff
Modified: trunk/Source/WebCore/ChangeLog (214267 => 214268)
--- trunk/Source/WebCore/ChangeLog 2017-03-22 18:20:56 UTC (rev 214267)
+++ trunk/Source/WebCore/ChangeLog 2017-03-22 19:23:12 UTC (rev 214268)
@@ -1,5 +1,16 @@
2017-03-22 Andy Estes <[email protected]>
+ [QuickLook] Move QuickLook.{h,mm} to platform/ios/
+ https://bugs.webkit.org/show_bug.cgi?id=169963
+
+ Reviewed by Andreas Kling.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/ios/QuickLook.h: Renamed from Source/WebCore/loader/ios/QuickLook.h.
+ * platform/ios/QuickLook.mm: Renamed from Source/WebCore/loader/ios/QuickLook.mm.
+
+2017-03-22 Andy Estes <[email protected]>
+
[QuickLook] Rename QuickLookHandle to PreviewLoader
https://bugs.webkit.org/show_bug.cgi?id=169961
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (214267 => 214268)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-03-22 18:20:56 UTC (rev 214267)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-03-22 19:23:12 UTC (rev 214268)
@@ -20789,8 +20789,6 @@
children = (
A185B4281E8211A100DC9118 /* PreviewLoader.h */,
A185B4271E8211A100DC9118 /* PreviewLoader.mm */,
- A15E31F11E0CB0AA004B371C /* QuickLook.h */,
- A15E31F21E0CB0AA004B371C /* QuickLook.mm */,
);
path = ios;
sourceTree = "<group>";
@@ -20864,6 +20862,8 @@
C5278B0B17F212EA003A2998 /* PlatformPasteboardIOS.mm */,
E45390320EAFD637003695C8 /* PlatformScreenIOS.mm */,
AAE3755D17429BCC006200C2 /* PlatformSpeechSynthesizerIOS.mm */,
+ A15E31F11E0CB0AA004B371C /* QuickLook.h */,
+ A15E31F21E0CB0AA004B371C /* QuickLook.mm */,
443917FE1A91B2F8006E04F2 /* QuickLookSoftLink.h */,
443917FD1A91B2F8006E04F2 /* QuickLookSoftLink.mm */,
CDFC360118CA61630026E56F /* RemoteCommandListenerIOS.h */,
Deleted: trunk/Source/WebCore/loader/ios/QuickLook.h (214267 => 214268)
--- trunk/Source/WebCore/loader/ios/QuickLook.h 2017-03-22 18:20:56 UTC (rev 214267)
+++ trunk/Source/WebCore/loader/ios/QuickLook.h 2017-03-22 19:23:12 UTC (rev 214268)
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2009-2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include <wtf/RetainPtr.h>
-
-OBJC_CLASS NSData;
-OBJC_CLASS NSSet;
-OBJC_CLASS NSString;
-OBJC_CLASS NSURL;
-OBJC_CLASS NSURLRequest;
-
-namespace WebCore {
-
-class URL;
-
-WEBCORE_EXPORT NSSet *QLPreviewGetSupportedMIMETypesSet();
-WEBCORE_EXPORT void removeQLPreviewConverterForURL(NSURL *);
-WEBCORE_EXPORT RetainPtr<NSURLRequest> registerQLPreviewConverterIfNeeded(NSURL *, NSString *mimeType, NSData *);
-WEBCORE_EXPORT const char* QLPreviewProtocol();
-WEBCORE_EXPORT bool isQuickLookPreviewURL(const URL&);
-WEBCORE_EXPORT NSString *createTemporaryFileForQuickLook(NSString *fileName);
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/loader/ios/QuickLook.mm (214267 => 214268)
--- trunk/Source/WebCore/loader/ios/QuickLook.mm 2017-03-22 18:20:56 UTC (rev 214267)
+++ trunk/Source/WebCore/loader/ios/QuickLook.mm 2017-03-22 19:23:12 UTC (rev 214268)
@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2009-2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "QuickLook.h"
-
-#if USE(QUICK_LOOK)
-
-#import "FileSystemIOS.h"
-#import "NSFileManagerSPI.h"
-#import "PreviewConverter.h"
-#import "ResourceRequest.h"
-#import "SchemeRegistry.h"
-#import <wtf/Lock.h>
-#import <wtf/NeverDestroyed.h>
-
-#import "QuickLookSoftLink.h"
-
-namespace WebCore {
-
-NSSet *QLPreviewGetSupportedMIMETypesSet()
-{
- static NeverDestroyed<RetainPtr<NSSet>> set = QLPreviewGetSupportedMIMETypes();
- return set.get().get();
-}
-
-static Lock& qlPreviewConverterDictionaryMutex()
-{
- static NeverDestroyed<Lock> mutex;
- return mutex;
-}
-
-static NSMutableDictionary *QLPreviewConverterDictionary()
-{
- static NSMutableDictionary *dictionary = [[NSMutableDictionary alloc] init];
- return dictionary;
-}
-
-static NSMutableDictionary *QLContentDictionary()
-{
- static NSMutableDictionary *contentDictionary = [[NSMutableDictionary alloc] init];
- return contentDictionary;
-}
-
-void removeQLPreviewConverterForURL(NSURL *url)
-{
- LockHolder lock(qlPreviewConverterDictionaryMutex());
- [QLPreviewConverterDictionary() removeObjectForKey:url];
- [QLContentDictionary() removeObjectForKey:url];
-}
-
-static void addQLPreviewConverterWithFileForURL(NSURL *url, id converter, NSString *fileName)
-{
- ASSERT(url);
- ASSERT(converter);
- LockHolder lock(qlPreviewConverterDictionaryMutex());
- [QLPreviewConverterDictionary() setObject:converter forKey:url];
- [QLContentDictionary() setObject:(fileName ? fileName : @"") forKey:url];
-}
-
-RetainPtr<NSURLRequest> registerQLPreviewConverterIfNeeded(NSURL *url, NSString *mimeType, NSData *data)
-{
- RetainPtr<NSString> updatedMIMEType = adoptNS(QLTypeCopyBestMimeTypeForURLAndMimeType(url, mimeType));
-
- if ([QLPreviewGetSupportedMIMETypesSet() containsObject:updatedMIMEType.get()]) {
- RetainPtr<NSString> uti = adoptNS(QLTypeCopyUTIForURLAndMimeType(url, updatedMIMEType.get()));
-
- auto converter = std::make_unique<PreviewConverter>(data, uti.get());
- ResourceRequest previewRequest = converter->previewRequest();
-
- // We use [request URL] here instead of url since it will be
- // the URL that the WebDataSource will see during -dealloc.
- addQLPreviewConverterWithFileForURL(previewRequest.url(), converter->platformConverter(), nil);
-
- return previewRequest.nsURLRequest(DoNotUpdateHTTPBody);
- }
-
- return nil;
-}
-
-static Vector<char> createQLPreviewProtocol()
-{
- Vector<char> previewProtocol;
- const char* qlPreviewScheme = [QLPreviewScheme UTF8String];
- previewProtocol.append(qlPreviewScheme, strlen(qlPreviewScheme) + 1);
- return previewProtocol;
-}
-
-const char* QLPreviewProtocol()
-{
- static NeverDestroyed<Vector<char>> previewProtocol(createQLPreviewProtocol());
- return previewProtocol.get().data();
-}
-
-bool isQuickLookPreviewURL(const URL& url)
-{
- // Use some known protocols as a short-cut to avoid loading the QuickLook framework.
- if (url.protocolIsInHTTPFamily() || url.isBlankURL() || url.protocolIsBlob() || url.protocolIsData() || SchemeRegistry::shouldTreatURLSchemeAsLocal(url.protocol().toString()))
- return false;
- return url.protocolIs(QLPreviewProtocol());
-}
-
-static NSDictionary *temporaryFileAttributes()
-{
- static NSDictionary *attributes = [@{
- NSFileOwnerAccountName : NSUserName(),
- NSFilePosixPermissions : [NSNumber numberWithInteger:(WEB_UREAD | WEB_UWRITE)],
- } retain];
- return attributes;
-}
-
-static NSDictionary *temporaryDirectoryAttributes()
-{
- static NSDictionary *attributes = [@{
- NSFileOwnerAccountName : NSUserName(),
- NSFilePosixPermissions : [NSNumber numberWithInteger:(WEB_UREAD | WEB_UWRITE | WEB_UEXEC)],
- NSFileProtectionKey : NSFileProtectionCompleteUnlessOpen,
- } retain];
- return attributes;
-}
-
-NSString *createTemporaryFileForQuickLook(NSString *fileName)
-{
- NSString *downloadDirectory = createTemporaryDirectory(@"QuickLookContent");
- if (!downloadDirectory)
- return nil;
-
- NSFileManager *fileManager = [NSFileManager defaultManager];
-
- NSError *error;
- if (![fileManager setAttributes:temporaryDirectoryAttributes() ofItemAtPath:downloadDirectory error:&error]) {
- LOG_ERROR("Failed to set attribute NSFileProtectionCompleteUnlessOpen on directory %@ with error: %@.", downloadDirectory, error.localizedDescription);
- return nil;
- }
-
- NSString *contentPath = [downloadDirectory stringByAppendingPathComponent:fileName.lastPathComponent];
- if (![fileManager _web_createFileAtPath:contentPath contents:nil attributes:temporaryFileAttributes()]) {
- LOG_ERROR("Failed to create QuickLook temporary file at path %@.", contentPath);
- return nil;
- }
-
- return contentPath;
-}
-
-} // namespace WebCore
-
-#endif // USE(QUICK_LOOK)
Copied: trunk/Source/WebCore/platform/ios/QuickLook.h (from rev 214267, trunk/Source/WebCore/loader/ios/QuickLook.h) (0 => 214268)
--- trunk/Source/WebCore/platform/ios/QuickLook.h (rev 0)
+++ trunk/Source/WebCore/platform/ios/QuickLook.h 2017-03-22 19:23:12 UTC (rev 214268)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2009-2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <wtf/RetainPtr.h>
+
+OBJC_CLASS NSData;
+OBJC_CLASS NSSet;
+OBJC_CLASS NSString;
+OBJC_CLASS NSURL;
+OBJC_CLASS NSURLRequest;
+
+namespace WebCore {
+
+class URL;
+
+WEBCORE_EXPORT NSSet *QLPreviewGetSupportedMIMETypesSet();
+WEBCORE_EXPORT void removeQLPreviewConverterForURL(NSURL *);
+WEBCORE_EXPORT RetainPtr<NSURLRequest> registerQLPreviewConverterIfNeeded(NSURL *, NSString *mimeType, NSData *);
+WEBCORE_EXPORT const char* QLPreviewProtocol();
+WEBCORE_EXPORT bool isQuickLookPreviewURL(const URL&);
+WEBCORE_EXPORT NSString *createTemporaryFileForQuickLook(NSString *fileName);
+
+} // namespace WebCore
Copied: trunk/Source/WebCore/platform/ios/QuickLook.mm (from rev 214267, trunk/Source/WebCore/loader/ios/QuickLook.mm) (0 => 214268)
--- trunk/Source/WebCore/platform/ios/QuickLook.mm (rev 0)
+++ trunk/Source/WebCore/platform/ios/QuickLook.mm 2017-03-22 19:23:12 UTC (rev 214268)
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2009-2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "QuickLook.h"
+
+#if USE(QUICK_LOOK)
+
+#import "FileSystemIOS.h"
+#import "NSFileManagerSPI.h"
+#import "PreviewConverter.h"
+#import "ResourceRequest.h"
+#import "SchemeRegistry.h"
+#import <wtf/Lock.h>
+#import <wtf/NeverDestroyed.h>
+
+#import "QuickLookSoftLink.h"
+
+namespace WebCore {
+
+NSSet *QLPreviewGetSupportedMIMETypesSet()
+{
+ static NeverDestroyed<RetainPtr<NSSet>> set = QLPreviewGetSupportedMIMETypes();
+ return set.get().get();
+}
+
+static Lock& qlPreviewConverterDictionaryMutex()
+{
+ static NeverDestroyed<Lock> mutex;
+ return mutex;
+}
+
+static NSMutableDictionary *QLPreviewConverterDictionary()
+{
+ static NSMutableDictionary *dictionary = [[NSMutableDictionary alloc] init];
+ return dictionary;
+}
+
+static NSMutableDictionary *QLContentDictionary()
+{
+ static NSMutableDictionary *contentDictionary = [[NSMutableDictionary alloc] init];
+ return contentDictionary;
+}
+
+void removeQLPreviewConverterForURL(NSURL *url)
+{
+ LockHolder lock(qlPreviewConverterDictionaryMutex());
+ [QLPreviewConverterDictionary() removeObjectForKey:url];
+ [QLContentDictionary() removeObjectForKey:url];
+}
+
+static void addQLPreviewConverterWithFileForURL(NSURL *url, id converter, NSString *fileName)
+{
+ ASSERT(url);
+ ASSERT(converter);
+ LockHolder lock(qlPreviewConverterDictionaryMutex());
+ [QLPreviewConverterDictionary() setObject:converter forKey:url];
+ [QLContentDictionary() setObject:(fileName ? fileName : @"") forKey:url];
+}
+
+RetainPtr<NSURLRequest> registerQLPreviewConverterIfNeeded(NSURL *url, NSString *mimeType, NSData *data)
+{
+ RetainPtr<NSString> updatedMIMEType = adoptNS(QLTypeCopyBestMimeTypeForURLAndMimeType(url, mimeType));
+
+ if ([QLPreviewGetSupportedMIMETypesSet() containsObject:updatedMIMEType.get()]) {
+ RetainPtr<NSString> uti = adoptNS(QLTypeCopyUTIForURLAndMimeType(url, updatedMIMEType.get()));
+
+ auto converter = std::make_unique<PreviewConverter>(data, uti.get());
+ ResourceRequest previewRequest = converter->previewRequest();
+
+ // We use [request URL] here instead of url since it will be
+ // the URL that the WebDataSource will see during -dealloc.
+ addQLPreviewConverterWithFileForURL(previewRequest.url(), converter->platformConverter(), nil);
+
+ return previewRequest.nsURLRequest(DoNotUpdateHTTPBody);
+ }
+
+ return nil;
+}
+
+static Vector<char> createQLPreviewProtocol()
+{
+ Vector<char> previewProtocol;
+ const char* qlPreviewScheme = [QLPreviewScheme UTF8String];
+ previewProtocol.append(qlPreviewScheme, strlen(qlPreviewScheme) + 1);
+ return previewProtocol;
+}
+
+const char* QLPreviewProtocol()
+{
+ static NeverDestroyed<Vector<char>> previewProtocol(createQLPreviewProtocol());
+ return previewProtocol.get().data();
+}
+
+bool isQuickLookPreviewURL(const URL& url)
+{
+ // Use some known protocols as a short-cut to avoid loading the QuickLook framework.
+ if (url.protocolIsInHTTPFamily() || url.isBlankURL() || url.protocolIsBlob() || url.protocolIsData() || SchemeRegistry::shouldTreatURLSchemeAsLocal(url.protocol().toString()))
+ return false;
+ return url.protocolIs(QLPreviewProtocol());
+}
+
+static NSDictionary *temporaryFileAttributes()
+{
+ static NSDictionary *attributes = [@{
+ NSFileOwnerAccountName : NSUserName(),
+ NSFilePosixPermissions : [NSNumber numberWithInteger:(WEB_UREAD | WEB_UWRITE)],
+ } retain];
+ return attributes;
+}
+
+static NSDictionary *temporaryDirectoryAttributes()
+{
+ static NSDictionary *attributes = [@{
+ NSFileOwnerAccountName : NSUserName(),
+ NSFilePosixPermissions : [NSNumber numberWithInteger:(WEB_UREAD | WEB_UWRITE | WEB_UEXEC)],
+ NSFileProtectionKey : NSFileProtectionCompleteUnlessOpen,
+ } retain];
+ return attributes;
+}
+
+NSString *createTemporaryFileForQuickLook(NSString *fileName)
+{
+ NSString *downloadDirectory = createTemporaryDirectory(@"QuickLookContent");
+ if (!downloadDirectory)
+ return nil;
+
+ NSFileManager *fileManager = [NSFileManager defaultManager];
+
+ NSError *error;
+ if (![fileManager setAttributes:temporaryDirectoryAttributes() ofItemAtPath:downloadDirectory error:&error]) {
+ LOG_ERROR("Failed to set attribute NSFileProtectionCompleteUnlessOpen on directory %@ with error: %@.", downloadDirectory, error.localizedDescription);
+ return nil;
+ }
+
+ NSString *contentPath = [downloadDirectory stringByAppendingPathComponent:fileName.lastPathComponent];
+ if (![fileManager _web_createFileAtPath:contentPath contents:nil attributes:temporaryFileAttributes()]) {
+ LOG_ERROR("Failed to create QuickLook temporary file at path %@.", contentPath);
+ return nil;
+ }
+
+ return contentPath;
+}
+
+} // namespace WebCore
+
+#endif // USE(QUICK_LOOK)
