Diff
Modified: trunk/Source/WebCore/ChangeLog (240271 => 240272)
--- trunk/Source/WebCore/ChangeLog 2019-01-22 19:55:00 UTC (rev 240271)
+++ trunk/Source/WebCore/ChangeLog 2019-01-22 20:12:37 UTC (rev 240272)
@@ -1,3 +1,35 @@
+2019-01-22 David Kilzer <[email protected]>
+
+ Switch remaining QuickLook soft-linking in WebCore, WebKit over to QuickLookSoftLink.{cpp,h}
+ <https://webkit.org/b/193654>
+ <rdar://problem/47430290>
+
+ Reviewed by Alex Christensen.
+
+ - Moves QuickLookSoftLink.{h,mm} to PAL.
+ - Adds soft-link to 3 classes to consolidate QuickLook.framework
+ soft-linking.
+ - Updates existing source to work with above changes.
+
+ * SourcesCocoa.txt:
+ * UnifiedSources-input.xcfilelist:
+ * WebCore.xcodeproj/project.pbxproj:
+ - Remove QuickLookSoftLink.{h,mm} due to move to PAL.
+
+ * platform/ios/QuickLook.mm:
+ (WebCore::QLPreviewGetSupportedMIMETypesSet):
+ (WebCore::registerQLPreviewConverterIfNeeded):
+ - Update for QuickLookSoftLink.{h,mm} move to PAL.
+
+ * platform/network/ios/PreviewConverter.mm:
+ (WebCore::optionsWithPassword):
+ (WebCore::PreviewConverter::PreviewConverter):
+ - Switch to using QuickLookSoftLink.{h,mm} in PAL.
+
+ * platform/network/ios/WebCoreURLResponseIOS.mm:
+ (WebCore::adjustMIMETypeIfNecessary):
+ - Update for QuickLookSoftLink.{h,mm} move to PAL.
+
2019-01-22 Simon Fraser <[email protected]>
Fix the position of layers nested inside of composited overflow-scroll
Modified: trunk/Source/WebCore/PAL/ChangeLog (240271 => 240272)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-01-22 19:55:00 UTC (rev 240271)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-01-22 20:12:37 UTC (rev 240272)
@@ -1,3 +1,24 @@
+2019-01-22 David Kilzer <[email protected]>
+
+ Switch remaining QuickLook soft-linking in WebCore, WebKit over to QuickLookSoftLink.{cpp,h}
+ <https://webkit.org/b/193654>
+ <rdar://problem/47430290>
+
+ Reviewed by Alex Christensen.
+
+ - Moves QuickLookSoftLink.{h,mm} to PAL.
+ - Adds soft-link to 3 classes to consolidate QuickLook.framework
+ soft-linking.
+ - Updates existing source to work with above changes.
+
+ * PAL.xcodeproj/project.pbxproj:
+ - Add QuickLookSoftLink.{h,mm} due to move from WebCore.
+
+ * pal/ios/QuickLookSoftLink.h: Renamed from Source/WebCore/platform/ios/QuickLookSoftLink.h.
+ * pal/ios/QuickLookSoftLink.mm: Renamed from Source/WebCore/platform/ios/QuickLookSoftLink.mm.
+ - Add 3 classes for soft-linking.
+ - Change namespace from WebCore to PAL.
+
2019-01-21 David Kilzer <[email protected]>
Sort PAL Xcode project file
Modified: trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (240271 => 240272)
--- trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2019-01-22 19:55:00 UTC (rev 240271)
+++ trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2019-01-22 20:12:37 UTC (rev 240272)
@@ -112,6 +112,8 @@
2E1342CD215AA10A007199D2 /* UIKitSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E1342CB215AA10A007199D2 /* UIKitSoftLink.mm */; };
31308B1420A21705003FB929 /* SystemPreviewSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 31308B1320A21705003FB929 /* SystemPreviewSPI.h */; };
442956CD218A72DF0080DB54 /* RevealSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 442956CC218A72DE0080DB54 /* RevealSPI.h */; };
+ 4450FC9F21F5F602004DFA56 /* QuickLookSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4450FC9D21F5F602004DFA56 /* QuickLookSoftLink.mm */; };
+ 4450FCA021F5F602004DFA56 /* QuickLookSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 4450FC9E21F5F602004DFA56 /* QuickLookSoftLink.h */; };
570AB8F120AE2E8D00B8BE87 /* SecKeyProxySPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 570AB8F020AE2E8D00B8BE87 /* SecKeyProxySPI.h */; };
570AB8F920AF6E3D00B8BE87 /* NSXPCConnectionSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 570AB8F820AF6E3D00B8BE87 /* NSXPCConnectionSPI.h */; };
63C7EDC721AFAE04006A7B99 /* NSProgressSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 63E369F921AFA83F001C14BC /* NSProgressSPI.h */; };
@@ -270,6 +272,8 @@
31308B1320A21705003FB929 /* SystemPreviewSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SystemPreviewSPI.h; sourceTree = "<group>"; };
37119A7820CCB5FF002C6DC9 /* WebKitTargetConditionals.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitTargetConditionals.xcconfig; sourceTree = "<group>"; };
442956CC218A72DE0080DB54 /* RevealSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RevealSPI.h; sourceTree = "<group>"; };
+ 4450FC9D21F5F602004DFA56 /* QuickLookSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickLookSoftLink.mm; sourceTree = "<group>"; };
+ 4450FC9E21F5F602004DFA56 /* QuickLookSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookSoftLink.h; sourceTree = "<group>"; };
570AB8F020AE2E8D00B8BE87 /* SecKeyProxySPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecKeyProxySPI.h; sourceTree = "<group>"; };
570AB8F820AF6E3D00B8BE87 /* NSXPCConnectionSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSXPCConnectionSPI.h; sourceTree = "<group>"; };
63E369F921AFA83F001C14BC /* NSProgressSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSProgressSPI.h; sourceTree = "<group>"; };
@@ -576,6 +580,8 @@
2E87C06E215A993100D6CD32 /* ios */ = {
isa = PBXGroup;
children = (
+ 4450FC9E21F5F602004DFA56 /* QuickLookSoftLink.h */,
+ 4450FC9D21F5F602004DFA56 /* QuickLookSoftLink.mm */,
2E1342CA215AA10A007199D2 /* UIKitSoftLink.h */,
2E1342CB215AA10A007199D2 /* UIKitSoftLink.mm */,
);
@@ -748,6 +754,7 @@
0C2DA1571F3BEB4900DBC317 /* QuartzCoreSPI.h in Headers */,
A102658B1F56748C00B4C844 /* QuickDrawSPI.h in Headers */,
0C7785A01F45130F00F4EBB6 /* QuickLookMacSPI.h in Headers */,
+ 4450FCA021F5F602004DFA56 /* QuickLookSoftLink.h in Headers */,
0C5AF9201F43A4C7002EAC02 /* QuickLookSPI.h in Headers */,
442956CD218A72DF0080DB54 /* RevealSPI.h in Headers */,
570AB8F120AE2E8D00B8BE87 /* SecKeyProxySPI.h in Headers */,
@@ -867,6 +874,7 @@
0CF99CA41F736375007EE793 /* MediaTimeAVFoundation.cpp in Sources */,
A1F63CA021A4DBF7006FB43B /* PassKitSoftLink.mm in Sources */,
A1175B4F1F6B337300C4B9F0 /* PopupMenu.mm in Sources */,
+ 4450FC9F21F5F602004DFA56 /* QuickLookSoftLink.mm in Sources */,
A3C66CDC1F462D6A009E6EE9 /* SessionID.cpp in Sources */,
A3AB6E521F3D1DC5009C14B1 /* SleepDisabler.cpp in Sources */,
A3AB6E601F3D1E39009C14B1 /* SleepDisablerCocoa.cpp in Sources */,
Copied: trunk/Source/WebCore/PAL/pal/ios/QuickLookSoftLink.h (from rev 240271, trunk/Source/WebCore/platform/ios/QuickLookSoftLink.h) (0 => 240272)
--- trunk/Source/WebCore/PAL/pal/ios/QuickLookSoftLink.h (rev 0)
+++ trunk/Source/WebCore/PAL/pal/ios/QuickLookSoftLink.h 2019-01-22 20:12:37 UTC (rev 240272)
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2015-2019 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.
+ */
+
+#if USE(QUICK_LOOK)
+
+#include <pal/spi/ios/QuickLookSPI.h>
+#include <wtf/SoftLinking.h>
+
+SOFT_LINK_FRAMEWORK_FOR_HEADER(PAL, QuickLook)
+
+SOFT_LINK_CLASS_FOR_HEADER(PAL, QLItem)
+SOFT_LINK_CLASS_FOR_HEADER(PAL, QLPreviewController)
+SOFT_LINK_CLASS_FOR_HEADER(PAL, QLPreviewConverter)
+SOFT_LINK_CONSTANT_FOR_HEADER(PAL, QuickLook, kQLPreviewOptionPasswordKey, CFStringRef);
+SOFT_LINK_FUNCTION_FOR_HEADER(PAL, QuickLook, QLPreviewGetSupportedMIMETypes, NSSet *, (), ())
+#define QLPreviewGetSupportedMIMETypes softLink_QuickLook_QLPreviewGetSupportedMIMETypes
+SOFT_LINK_FUNCTION_FOR_HEADER(PAL, QuickLook, QLTypeCopyBestMimeTypeForFileNameAndMimeType, NSString *, (NSString *fileName, NSString *mimeType), (fileName, mimeType))
+#define QLTypeCopyBestMimeTypeForFileNameAndMimeType softLink_QuickLook_QLTypeCopyBestMimeTypeForFileNameAndMimeType
+SOFT_LINK_FUNCTION_FOR_HEADER(PAL, QuickLook, QLTypeCopyBestMimeTypeForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
+#define QLTypeCopyBestMimeTypeForURLAndMimeType softLink_QuickLook_QLTypeCopyBestMimeTypeForURLAndMimeType
+SOFT_LINK_FUNCTION_FOR_HEADER(PAL, QuickLook, QLTypeCopyUTIForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
+#define QLTypeCopyUTIForURLAndMimeType softLink_QuickLook_QLTypeCopyUTIForURLAndMimeType
+
+#endif // USE(QUICK_LOOK)
Copied: trunk/Source/WebCore/PAL/pal/ios/QuickLookSoftLink.mm (from rev 240271, trunk/Source/WebCore/platform/ios/QuickLookSoftLink.mm) (0 => 240272)
--- trunk/Source/WebCore/PAL/pal/ios/QuickLookSoftLink.mm (rev 0)
+++ trunk/Source/WebCore/PAL/pal/ios/QuickLookSoftLink.mm 2019-01-22 20:12:37 UTC (rev 240272)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2015-2019 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"
+
+#if USE(QUICK_LOOK)
+
+#import <pal/spi/ios/QuickLookSPI.h>
+#import <wtf/SoftLinking.h>
+
+SOFT_LINK_FRAMEWORK_FOR_SOURCE(PAL, QuickLook)
+
+SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, QuickLook, QLItem, PAL_EXPORT)
+SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, QuickLook, QLPreviewController, PAL_EXPORT)
+SOFT_LINK_CLASS_FOR_SOURCE(PAL, QuickLook, QLPreviewConverter)
+SOFT_LINK_CONSTANT_FOR_SOURCE(PAL, QuickLook, kQLPreviewOptionPasswordKey, CFStringRef);
+SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, QuickLook, QLPreviewGetSupportedMIMETypes, NSSet *, (), ())
+SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, QuickLook, QLTypeCopyBestMimeTypeForFileNameAndMimeType, NSString *, (NSString *fileName, NSString *mimeType), (fileName, mimeType))
+SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, QuickLook, QLTypeCopyBestMimeTypeForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
+SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, QuickLook, QLTypeCopyUTIForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
+
+#endif // USE(QUICK_LOOK)
Modified: trunk/Source/WebCore/SourcesCocoa.txt (240271 => 240272)
--- trunk/Source/WebCore/SourcesCocoa.txt 2019-01-22 19:55:00 UTC (rev 240271)
+++ trunk/Source/WebCore/SourcesCocoa.txt 2019-01-22 20:12:37 UTC (rev 240272)
@@ -410,7 +410,6 @@
platform/ios/PlatformSpeechSynthesizerIOS.mm @no-unify
platform/ios/PlaybackSessionInterfaceAVKit.mm @no-unify
platform/ios/QuickLook.mm
-platform/ios/QuickLookSoftLink.mm @no-unify
platform/ios/RemoteCommandListenerIOS.mm
platform/ios/ScrollAnimatorIOS.mm
platform/ios/ScrollbarThemeIOS.mm
Modified: trunk/Source/WebCore/UnifiedSources-input.xcfilelist (240271 => 240272)
--- trunk/Source/WebCore/UnifiedSources-input.xcfilelist 2019-01-22 19:55:00 UTC (rev 240271)
+++ trunk/Source/WebCore/UnifiedSources-input.xcfilelist 2019-01-22 20:12:37 UTC (rev 240272)
@@ -2990,7 +2990,6 @@
$(SRCROOT)/platform/ios/PlatformSpeechSynthesizerIOS.mm
$(SRCROOT)/platform/ios/PlaybackSessionInterfaceAVKit.mm
$(SRCROOT)/platform/ios/QuickLook.mm
-$(SRCROOT)/platform/ios/QuickLookSoftLink.mm
$(SRCROOT)/platform/ios/RemoteCommandListenerIOS.mm
$(SRCROOT)/platform/ios/ScrollAnimatorIOS.mm
$(SRCROOT)/platform/ios/ScrollViewIOS.mm
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (240271 => 240272)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2019-01-22 19:55:00 UTC (rev 240271)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2019-01-22 20:12:37 UTC (rev 240272)
@@ -808,7 +808,6 @@
2D8B92FF203D13E1009C868F /* UnifiedSource530.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE5F85D31FA23859006DB63B /* UnifiedSource530.cpp */; };
2D8FEBDD143E3EF70072502B /* CSSCrossfadeValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8FEBDB143E3EF70072502B /* CSSCrossfadeValue.h */; };
2D9066070BE141D400956998 /* RenderLayoutState.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9066050BE141D400956998 /* RenderLayoutState.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 2D92A79A2134AD7900F493FD /* QuickLookSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 443917FD1A91B2F8006E04F2 /* QuickLookSoftLink.mm */; };
2D93AEE319DF5641002A86C3 /* ServicesOverlayController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D93AEE119DF5641002A86C3 /* ServicesOverlayController.h */; };
2D97F04719DD413C001EE9C3 /* MockPageOverlayClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DAAE32C19DCAF6000E002D2 /* MockPageOverlayClient.cpp */; };
2D97F04819DD4140001EE9C3 /* MockPageOverlayClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DAAE32D19DCAF6000E002D2 /* MockPageOverlayClient.h */; };
@@ -1215,7 +1214,6 @@
43C092BC12D9E4EE00A989C3 /* RenderSVGForeignObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 43C092BA12D9E4EE00A989C3 /* RenderSVGForeignObject.h */; };
43EDD67F1B485DBF00640E75 /* CombinedFiltersAlphabet.h in Headers */ = {isa = PBXBuildFile; fileRef = 43EDD67D1B485DBF00640E75 /* CombinedFiltersAlphabet.h */; settings = {ATTRIBUTES = (Private, ); }; };
4415292E0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4415292C0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 443918001A91B2F8006E04F2 /* QuickLookSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 443917FE1A91B2F8006E04F2 /* QuickLookSoftLink.h */; };
445775E520472F73008DCE5D /* LocalDefaultSystemAppearance.h in Headers */ = {isa = PBXBuildFile; fileRef = 445775E420472F73008DCE5D /* LocalDefaultSystemAppearance.h */; settings = {ATTRIBUTES = (Private, ); }; };
4471710E205AF945000A116E /* MediaQueryParserContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 4471710C205AF945000A116E /* MediaQueryParserContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
447958041643B49A001E0A7F /* ParsedContentType.h in Headers */ = {isa = PBXBuildFile; fileRef = 447958031643B47B001E0A7F /* ParsedContentType.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -7647,8 +7645,6 @@
4415292C0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLPlugInImageElement.h; sourceTree = "<group>"; };
4415292D0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLPlugInImageElement.cpp; sourceTree = "<group>"; };
442956CA218A6D300080DB54 /* DictionaryLookupLegacy.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = DictionaryLookupLegacy.mm; sourceTree = "<group>"; };
- 443917FD1A91B2F8006E04F2 /* QuickLookSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickLookSoftLink.mm; sourceTree = "<group>"; };
- 443917FE1A91B2F8006E04F2 /* QuickLookSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookSoftLink.h; sourceTree = "<group>"; };
443F04260E75C8FB007E5407 /* NetworkStateNotifierIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkStateNotifierIOS.mm; sourceTree = "<group>"; };
444D4E210F708B2E003158E0 /* WebCoreURLResponseIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreURLResponseIOS.mm; sourceTree = "<group>"; };
445775E420472F73008DCE5D /* LocalDefaultSystemAppearance.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LocalDefaultSystemAppearance.h; sourceTree = "<group>"; };
@@ -22428,8 +22424,6 @@
CDA29A2F1CBF73FC00901CCF /* PlaybackSessionInterfaceAVKit.mm */,
A15E31F11E0CB0AA004B371C /* QuickLook.h */,
A15E31F21E0CB0AA004B371C /* QuickLook.mm */,
- 443917FE1A91B2F8006E04F2 /* QuickLookSoftLink.h */,
- 443917FD1A91B2F8006E04F2 /* QuickLookSoftLink.mm */,
CDFC360118CA61630026E56F /* RemoteCommandListenerIOS.h */,
CDFC360218CA61630026E56F /* RemoteCommandListenerIOS.mm */,
0F17747E1378B771009DA76A /* ScrollAnimatorIOS.h */,
@@ -31061,7 +31055,6 @@
550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */,
83C1F5941EDF69D300410D27 /* QualifiedNameCache.h in Headers */,
A15E31F41E0CB0B5004B371C /* QuickLook.h in Headers */,
- 443918001A91B2F8006E04F2 /* QuickLookSoftLink.h in Headers */,
072AE1E8183C0741000A5988 /* QuickTimePluginReplacement.h in Headers */,
379E371713736A6600B9E919 /* QuotedPrintable.h in Headers */,
5A574F29131DB96D00471B88 /* QuotesData.h in Headers */,
@@ -32851,7 +32844,6 @@
AA12DF491743DF83004DAFDF /* PlatformSpeechSynthesizerIOS.mm in Sources */,
CDA29A301CBF74D400901CCF /* PlaybackSessionInterfaceAVKit.mm in Sources */,
CDA29A161CBDA56C00901CCF /* PlaybackSessionInterfaceMac.mm in Sources */,
- 2D92A79A2134AD7900F493FD /* QuickLookSoftLink.mm in Sources */,
419242492127B93E00634FCF /* RealtimeOutgoingVideoSourceCocoa.mm in Sources */,
316DCB8A1E7A6996001B5F87 /* RTCIceTransport.cpp in Sources */,
BC51156E12B1749C00C96754 /* ScrollAnimatorMac.mm in Sources */,
Modified: trunk/Source/WebCore/platform/ios/QuickLook.mm (240271 => 240272)
--- trunk/Source/WebCore/platform/ios/QuickLook.mm 2019-01-22 19:55:00 UTC (rev 240271)
+++ trunk/Source/WebCore/platform/ios/QuickLook.mm 2019-01-22 20:12:37 UTC (rev 240272)
@@ -32,12 +32,11 @@
#import "PreviewConverter.h"
#import "ResourceRequest.h"
#import "SchemeRegistry.h"
+#import <pal/ios/QuickLookSoftLink.h>
#import <pal/spi/cocoa/NSFileManagerSPI.h>
#import <wtf/Lock.h>
#import <wtf/NeverDestroyed.h>
-#import "QuickLookSoftLink.h"
-
namespace WebCore {
const char* QLPreviewProtocol = "x-apple-ql-id";
@@ -44,7 +43,7 @@
NSSet *QLPreviewGetSupportedMIMETypesSet()
{
- static NSSet *set = [QLPreviewGetSupportedMIMETypes() retain];
+ static NSSet *set = [PAL::softLink_QuickLook_QLPreviewGetSupportedMIMETypes() retain];
return set;
}
@@ -80,10 +79,10 @@
RetainPtr<NSURLRequest> registerQLPreviewConverterIfNeeded(NSURL *url, NSString *mimeType, NSData *data)
{
- RetainPtr<NSString> updatedMIMEType = adoptNS(QLTypeCopyBestMimeTypeForURLAndMimeType(url, mimeType));
+ RetainPtr<NSString> updatedMIMEType = adoptNS(PAL::softLink_QuickLook_QLTypeCopyBestMimeTypeForURLAndMimeType(url, mimeType));
if ([QLPreviewGetSupportedMIMETypesSet() containsObject:updatedMIMEType.get()]) {
- RetainPtr<NSString> uti = adoptNS(QLTypeCopyUTIForURLAndMimeType(url, updatedMIMEType.get()));
+ RetainPtr<NSString> uti = adoptNS(PAL::softLink_QuickLook_QLTypeCopyUTIForURLAndMimeType(url, updatedMIMEType.get()));
auto converter = std::make_unique<PreviewConverter>(data, uti.get());
ResourceRequest previewRequest = converter->previewRequest();
Deleted: trunk/Source/WebCore/platform/ios/QuickLookSoftLink.h (240271 => 240272)
--- trunk/Source/WebCore/platform/ios/QuickLookSoftLink.h 2019-01-22 19:55:00 UTC (rev 240271)
+++ trunk/Source/WebCore/platform/ios/QuickLookSoftLink.h 2019-01-22 20:12:37 UTC (rev 240272)
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2015-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.
- */
-
-#if USE(QUICK_LOOK)
-
-#include <pal/spi/ios/QuickLookSPI.h>
-#include <wtf/SoftLinking.h>
-
-SOFT_LINK_FRAMEWORK_FOR_HEADER(WebCore, QuickLook)
-
-SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, QuickLook, QLPreviewGetSupportedMIMETypes, NSSet *, (), ())
-#define QLPreviewGetSupportedMIMETypes softLink_QuickLook_QLPreviewGetSupportedMIMETypes
-SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, QuickLook, QLTypeCopyBestMimeTypeForFileNameAndMimeType, NSString *, (NSString *fileName, NSString *mimeType), (fileName, mimeType))
-#define QLTypeCopyBestMimeTypeForFileNameAndMimeType softLink_QuickLook_QLTypeCopyBestMimeTypeForFileNameAndMimeType
-SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, QuickLook, QLTypeCopyBestMimeTypeForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
-#define QLTypeCopyBestMimeTypeForURLAndMimeType softLink_QuickLook_QLTypeCopyBestMimeTypeForURLAndMimeType
-SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, QuickLook, QLTypeCopyUTIForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
-#define QLTypeCopyUTIForURLAndMimeType softLink_QuickLook_QLTypeCopyUTIForURLAndMimeType
-
-#endif // USE(QUICK_LOOK)
Deleted: trunk/Source/WebCore/platform/ios/QuickLookSoftLink.mm (240271 => 240272)
--- trunk/Source/WebCore/platform/ios/QuickLookSoftLink.mm 2019-01-22 19:55:00 UTC (rev 240271)
+++ trunk/Source/WebCore/platform/ios/QuickLookSoftLink.mm 2019-01-22 20:12:37 UTC (rev 240272)
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2015-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"
-
-#if USE(QUICK_LOOK)
-
-#import <pal/spi/ios/QuickLookSPI.h>
-#import <wtf/SoftLinking.h>
-
-SOFT_LINK_FRAMEWORK_FOR_SOURCE(WebCore, QuickLook)
-
-SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, QuickLook, QLPreviewGetSupportedMIMETypes, NSSet *, (), ())
-SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, QuickLook, QLTypeCopyBestMimeTypeForFileNameAndMimeType, NSString *, (NSString *fileName, NSString *mimeType), (fileName, mimeType))
-SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, QuickLook, QLTypeCopyBestMimeTypeForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
-SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, QuickLook, QLTypeCopyUTIForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
-
-#endif // USE(QUICK_LOOK)
Modified: trunk/Source/WebCore/platform/network/ios/PreviewConverter.mm (240271 => 240272)
--- trunk/Source/WebCore/platform/network/ios/PreviewConverter.mm 2019-01-22 19:55:00 UTC (rev 240271)
+++ trunk/Source/WebCore/platform/network/ios/PreviewConverter.mm 2019-01-22 20:12:37 UTC (rev 240272)
@@ -30,13 +30,9 @@
#import "ResourceRequest.h"
#import "ResourceResponse.h"
+#import <pal/ios/QuickLookSoftLink.h>
#import <pal/spi/ios/QuickLookSPI.h>
-#import <wtf/SoftLinking.h>
-SOFT_LINK_FRAMEWORK(QuickLook);
-SOFT_LINK_CLASS(QuickLook, QLPreviewConverter);
-SOFT_LINK_CONSTANT(QuickLook, kQLPreviewOptionPasswordKey, CFStringRef);
-
namespace WebCore {
static NSDictionary *optionsWithPassword(const String& password)
@@ -44,16 +40,16 @@
if (password.isNull())
return nil;
- return @{ (NSString *)getkQLPreviewOptionPasswordKey() : password };
+ return @{ (NSString *)PAL::get_QuickLook_kQLPreviewOptionPasswordKey() : password };
}
PreviewConverter::PreviewConverter(id delegate, const ResourceResponse& response, const String& password)
- : m_platformConverter { adoptNS([allocQLPreviewConverterInstance() initWithConnection:nil delegate:delegate response:response.nsURLResponse() options:optionsWithPassword(password)]) }
+ : m_platformConverter { adoptNS([PAL::allocQLPreviewConverterInstance() initWithConnection:nil delegate:delegate response:response.nsURLResponse() options:optionsWithPassword(password)]) }
{
}
PreviewConverter::PreviewConverter(NSData *data, const String& uti, const String& password)
- : m_platformConverter { adoptNS([allocQLPreviewConverterInstance() initWithData:data name:nil uti:uti options:optionsWithPassword(password)]) }
+ : m_platformConverter { adoptNS([PAL::allocQLPreviewConverterInstance() initWithData:data name:nil uti:uti options:optionsWithPassword(password)]) }
{
}
Modified: trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm (240271 => 240272)
--- trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm 2019-01-22 19:55:00 UTC (rev 240271)
+++ trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm 2019-01-22 20:12:37 UTC (rev 240272)
@@ -34,9 +34,8 @@
#import "QuickLook.h"
#import "UTIUtilities.h"
#import <MobileCoreServices/MobileCoreServices.h>
+#import <pal/ios/QuickLookSoftLink.h>
-#import "QuickLookSoftLink.h"
-
namespace WebCore {
// <rdar://problem/46332893> Register .mjs files as whatever UTI indicates _javascript_
@@ -82,7 +81,7 @@
// We filter the basic MIME types so that we don't do unnecessary work in standard browsing situations.
if (isMainResourceLoad && shouldUseQuickLookForMIMEType((NSString *)updatedMIMEType.get())) {
RetainPtr<CFStringRef> suggestedFilename = adoptCF(CFURLResponseCopySuggestedFilename(cfResponse));
- RetainPtr<CFStringRef> quickLookMIMEType = adoptCF((CFStringRef)QLTypeCopyBestMimeTypeForFileNameAndMimeType((NSString *)suggestedFilename.get(), (NSString *)mimeType.get()));
+ RetainPtr<CFStringRef> quickLookMIMEType = adoptCF((CFStringRef)PAL::softLink_QuickLook_QLTypeCopyBestMimeTypeForFileNameAndMimeType((NSString *)suggestedFilename.get(), (NSString *)mimeType.get()));
if (!quickLookMIMEType) {
auto url = ""
if ([(NSURL *)url isFileURL]) {
Modified: trunk/Source/WebKit/ChangeLog (240271 => 240272)
--- trunk/Source/WebKit/ChangeLog 2019-01-22 19:55:00 UTC (rev 240271)
+++ trunk/Source/WebKit/ChangeLog 2019-01-22 20:12:37 UTC (rev 240272)
@@ -1,3 +1,23 @@
+2019-01-22 David Kilzer <[email protected]>
+
+ Switch remaining QuickLook soft-linking in WebCore, WebKit over to QuickLookSoftLink.{cpp,h}
+ <https://webkit.org/b/193654>
+ <rdar://problem/47430290>
+
+ Reviewed by Alex Christensen.
+
+ - Moves QuickLookSoftLink.{h,mm} to PAL.
+ - Adds soft-link to 3 classes to consolidate QuickLook.framework
+ soft-linking.
+ - Updates existing source to work with above changes.
+
+ * UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
+ (-[_WKPreviewControllerDataSource previewController:previewItemAtIndex:]):
+ (WebKit::SystemPreviewController::start):
+ * UIProcess/ios/WKSystemPreviewView.mm:
+ (-[WKSystemPreviewView web_setContentProviderData:suggestedFilename:]):
+ - Switch to using QuickLookSoftLink.{h,mm} in PAL.
+
2019-01-22 Oriol Brufau <[email protected]>
[css-logical] Implement flow-relative margin, padding and border shorthands
Modified: trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm (240271 => 240272)
--- trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm 2019-01-22 19:55:00 UTC (rev 240271)
+++ trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm 2019-01-22 20:12:37 UTC (rev 240272)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -34,14 +34,10 @@
#import <QuickLook/QuickLook.h>
#import <UIKit/UIViewController.h>
#import <WebCore/MIMETypeRegistry.h>
+#import <pal/ios/QuickLookSoftLink.h>
#import <pal/spi/ios/QuickLookSPI.h>
-#import <wtf/SoftLinking.h>
#import <wtf/WeakObjCPtr.h>
-SOFT_LINK_FRAMEWORK(QuickLook)
-SOFT_LINK_CLASS(QuickLook, QLPreviewController);
-SOFT_LINK_CLASS(QuickLook, QLItem);
-
@interface _WKPreviewControllerDataSource : NSObject <QLPreviewControllerDataSource> {
RetainPtr<NSItemProvider> _itemProvider;
RetainPtr<QLItem> _item;
@@ -88,7 +84,7 @@
// then we'll need a table.
static NSString *contentType = (__bridge NSString *) UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, CFSTR("usdz"), nil);
- _item = adoptNS([allocQLItemInstance() initWithPreviewItemProvider:_itemProvider.get() contentType:contentType previewTitle:@"Preview" fileSize:@(0)]);
+ _item = adoptNS([PAL::allocQLItemInstance() initWithPreviewItemProvider:_itemProvider.get() contentType:contentType previewTitle:@"Preview" fileSize:@(0)]);
[_item setUseLoadingTimeout:NO];
WeakObjCPtr<_WKPreviewControllerDataSource> weakSelf { self };
@@ -204,7 +200,7 @@
if (!presentingViewController)
return;
- m_qlPreviewController = adoptNS([allocQLPreviewControllerInstance() init]);
+ m_qlPreviewController = adoptNS([PAL::allocQLPreviewControllerInstance() init]);
m_qlPreviewControllerDelegate = adoptNS([[_WKPreviewControllerDelegate alloc] initWithSystemPreviewController:this fromRect:fromRect]);
[m_qlPreviewController setDelegate:m_qlPreviewControllerDelegate.get()];
Modified: trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm (240271 => 240272)
--- trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm 2019-01-22 19:55:00 UTC (rev 240271)
+++ trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm 2019-01-22 20:12:37 UTC (rev 240272)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -36,15 +36,12 @@
#import <WebCore/FloatRect.h>
#import <WebCore/LocalizedStrings.h>
#import <WebCore/MIMETypeRegistry.h>
+#import <pal/ios/QuickLookSoftLink.h>
#import <pal/spi/cg/CoreGraphicsSPI.h>
#import <pal/spi/ios/SystemPreviewSPI.h>
#import <wtf/RetainPtr.h>
-#import <wtf/SoftLinking.h>
#import <wtf/Vector.h>
-SOFT_LINK_FRAMEWORK(QuickLook);
-SOFT_LINK_CLASS(QuickLook, QLItem);
-
SOFT_LINK_PRIVATE_FRAMEWORK(AssetViewer);
SOFT_LINK_CLASS(AssetViewer, ASVThumbnailView);
@@ -105,7 +102,7 @@
NSString *contentType = getUTIForSystemPreviewMIMEType(_mimeType.get());
- _item = adoptNS([allocQLItemInstance() initWithDataProvider:self contentType:contentType previewTitle:_suggestedFilename.get()]);
+ _item = adoptNS([PAL::allocQLItemInstance() initWithDataProvider:self contentType:contentType previewTitle:_suggestedFilename.get()]);
[_item setUseLoadingTimeout:NO];
_thumbnailView = adoptNS([allocASVThumbnailViewInstance() init]);
