Changeset 240272 in webkit


Ignore:
Timestamp:
Jan 22, 2019 12:12:37 PM (5 years ago)
Author:
ddkilzer@apple.com
Message:

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.

Source/WebCore:

  • 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.

Source/WebCore/PAL:

  • 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.

Source/WebKit:

  • 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.
Location:
trunk/Source
Files:
12 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r240271 r240272  
     12019-01-22  David Kilzer  <ddkilzer@apple.com>
     2
     3        Switch remaining QuickLook soft-linking in WebCore, WebKit over to QuickLookSoftLink.{cpp,h}
     4        <https://webkit.org/b/193654>
     5        <rdar://problem/47430290>
     6
     7        Reviewed by Alex Christensen.
     8
     9        - Moves QuickLookSoftLink.{h,mm} to PAL.
     10        - Adds soft-link to 3 classes to consolidate QuickLook.framework
     11          soft-linking.
     12        - Updates existing source to work with above changes.
     13
     14        * SourcesCocoa.txt:
     15        * UnifiedSources-input.xcfilelist:
     16        * WebCore.xcodeproj/project.pbxproj:
     17        - Remove QuickLookSoftLink.{h,mm} due to move to PAL.
     18
     19        * platform/ios/QuickLook.mm:
     20        (WebCore::QLPreviewGetSupportedMIMETypesSet):
     21        (WebCore::registerQLPreviewConverterIfNeeded):
     22        - Update for QuickLookSoftLink.{h,mm} move to PAL.
     23
     24        * platform/network/ios/PreviewConverter.mm:
     25        (WebCore::optionsWithPassword):
     26        (WebCore::PreviewConverter::PreviewConverter):
     27        - Switch to using QuickLookSoftLink.{h,mm} in PAL.
     28
     29        * platform/network/ios/WebCoreURLResponseIOS.mm:
     30        (WebCore::adjustMIMETypeIfNecessary):
     31        - Update for QuickLookSoftLink.{h,mm} move to PAL.
     32
    1332019-01-22  Simon Fraser  <simon.fraser@apple.com>
    234

  • trunk/Source/WebCore/PAL/ChangeLog

    r240236 r240272  
     12019-01-22  David Kilzer  <ddkilzer@apple.com>
     2
     3        Switch remaining QuickLook soft-linking in WebCore, WebKit over to QuickLookSoftLink.{cpp,h}
     4        <https://webkit.org/b/193654>
     5        <rdar://problem/47430290>
     6
     7        Reviewed by Alex Christensen.
     8
     9        - Moves QuickLookSoftLink.{h,mm} to PAL.
     10        - Adds soft-link to 3 classes to consolidate QuickLook.framework
     11          soft-linking.
     12        - Updates existing source to work with above changes.
     13
     14        * PAL.xcodeproj/project.pbxproj:
     15        - Add QuickLookSoftLink.{h,mm} due to move from WebCore.
     16
     17        * pal/ios/QuickLookSoftLink.h: Renamed from Source/WebCore/platform/ios/QuickLookSoftLink.h.
     18        * pal/ios/QuickLookSoftLink.mm: Renamed from Source/WebCore/platform/ios/QuickLookSoftLink.mm.
     19        - Add 3 classes for soft-linking.
     20        - Change namespace from WebCore to PAL.
     21
    1222019-01-21  David Kilzer  <ddkilzer@apple.com>
    223

  • trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj

    r240236 r240272  
    113113                31308B1420A21705003FB929 /* SystemPreviewSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 31308B1320A21705003FB929 /* SystemPreviewSPI.h */; };
    114114                442956CD218A72DF0080DB54 /* RevealSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 442956CC218A72DE0080DB54 /* RevealSPI.h */; };
     115                4450FC9F21F5F602004DFA56 /* QuickLookSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4450FC9D21F5F602004DFA56 /* QuickLookSoftLink.mm */; };
     116                4450FCA021F5F602004DFA56 /* QuickLookSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 4450FC9E21F5F602004DFA56 /* QuickLookSoftLink.h */; };
    115117                570AB8F120AE2E8D00B8BE87 /* SecKeyProxySPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 570AB8F020AE2E8D00B8BE87 /* SecKeyProxySPI.h */; };
    116118                570AB8F920AF6E3D00B8BE87 /* NSXPCConnectionSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 570AB8F820AF6E3D00B8BE87 /* NSXPCConnectionSPI.h */; };
    … …  
    271273                37119A7820CCB5FF002C6DC9 /* WebKitTargetConditionals.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitTargetConditionals.xcconfig; sourceTree = "<group>"; };
    272274                442956CC218A72DE0080DB54 /* RevealSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RevealSPI.h; sourceTree = "<group>"; };
     275                4450FC9D21F5F602004DFA56 /* QuickLookSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickLookSoftLink.mm; sourceTree = "<group>"; };
     276                4450FC9E21F5F602004DFA56 /* QuickLookSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookSoftLink.h; sourceTree = "<group>"; };
    273277                570AB8F020AE2E8D00B8BE87 /* SecKeyProxySPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecKeyProxySPI.h; sourceTree = "<group>"; };
    274278                570AB8F820AF6E3D00B8BE87 /* NSXPCConnectionSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSXPCConnectionSPI.h; sourceTree = "<group>"; };
    … …  
    577581                        isa = PBXGroup;
    578582                        children = (
     583                                4450FC9E21F5F602004DFA56 /* QuickLookSoftLink.h */,
     584                                4450FC9D21F5F602004DFA56 /* QuickLookSoftLink.mm */,
    579585                                2E1342CA215AA10A007199D2 /* UIKitSoftLink.h */,
    580586                                2E1342CB215AA10A007199D2 /* UIKitSoftLink.mm */,
    … …  
    749755                                A102658B1F56748C00B4C844 /* QuickDrawSPI.h in Headers */,
    750756                                0C7785A01F45130F00F4EBB6 /* QuickLookMacSPI.h in Headers */,
     757                                4450FCA021F5F602004DFA56 /* QuickLookSoftLink.h in Headers */,
    751758                                0C5AF9201F43A4C7002EAC02 /* QuickLookSPI.h in Headers */,
    752759                                442956CD218A72DF0080DB54 /* RevealSPI.h in Headers */,
    … …  
    868875                                A1F63CA021A4DBF7006FB43B /* PassKitSoftLink.mm in Sources */,
    869876                                A1175B4F1F6B337300C4B9F0 /* PopupMenu.mm in Sources */,
     877                                4450FC9F21F5F602004DFA56 /* QuickLookSoftLink.mm in Sources */,
    870878                                A3C66CDC1F462D6A009E6EE9 /* SessionID.cpp in Sources */,
    871879                                A3AB6E521F3D1DC5009C14B1 /* SleepDisabler.cpp in Sources */,

  • trunk/Source/WebCore/PAL/pal/ios/QuickLookSoftLink.h

    r240271 r240272  
    11/*
    2  * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
     2 * Copyright (C) 2015-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2828#include <wtf/SoftLinking.h>
    2929
    30 SOFT_LINK_FRAMEWORK_FOR_HEADER(WebCore, QuickLook)
     30SOFT_LINK_FRAMEWORK_FOR_HEADER(PAL, QuickLook)
    3131
    32 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, QuickLook, QLPreviewGetSupportedMIMETypes, NSSet *, (), ())
     32SOFT_LINK_CLASS_FOR_HEADER(PAL, QLItem)
     33SOFT_LINK_CLASS_FOR_HEADER(PAL, QLPreviewController)
     34SOFT_LINK_CLASS_FOR_HEADER(PAL, QLPreviewConverter)
     35SOFT_LINK_CONSTANT_FOR_HEADER(PAL, QuickLook, kQLPreviewOptionPasswordKey, CFStringRef);
     36SOFT_LINK_FUNCTION_FOR_HEADER(PAL, QuickLook, QLPreviewGetSupportedMIMETypes, NSSet *, (), ())
    3337#define QLPreviewGetSupportedMIMETypes softLink_QuickLook_QLPreviewGetSupportedMIMETypes
    34 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, QuickLook, QLTypeCopyBestMimeTypeForFileNameAndMimeType, NSString *, (NSString *fileName, NSString *mimeType), (fileName, mimeType))
     38SOFT_LINK_FUNCTION_FOR_HEADER(PAL, QuickLook, QLTypeCopyBestMimeTypeForFileNameAndMimeType, NSString *, (NSString *fileName, NSString *mimeType), (fileName, mimeType))
    3539#define QLTypeCopyBestMimeTypeForFileNameAndMimeType softLink_QuickLook_QLTypeCopyBestMimeTypeForFileNameAndMimeType
    36 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, QuickLook, QLTypeCopyBestMimeTypeForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
     40SOFT_LINK_FUNCTION_FOR_HEADER(PAL, QuickLook, QLTypeCopyBestMimeTypeForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
    3741#define QLTypeCopyBestMimeTypeForURLAndMimeType softLink_QuickLook_QLTypeCopyBestMimeTypeForURLAndMimeType
    38 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, QuickLook, QLTypeCopyUTIForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
     42SOFT_LINK_FUNCTION_FOR_HEADER(PAL, QuickLook, QLTypeCopyUTIForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
    3943#define QLTypeCopyUTIForURLAndMimeType softLink_QuickLook_QLTypeCopyUTIForURLAndMimeType
    4044

  • trunk/Source/WebCore/PAL/pal/ios/QuickLookSoftLink.mm

    r240271 r240272  
    11/*
    2  * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
     2 * Copyright (C) 2015-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3030#import <wtf/SoftLinking.h>
    3131
    32 SOFT_LINK_FRAMEWORK_FOR_SOURCE(WebCore, QuickLook)
     32SOFT_LINK_FRAMEWORK_FOR_SOURCE(PAL, QuickLook)
    3333
    34 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, QuickLook, QLPreviewGetSupportedMIMETypes, NSSet *, (), ())
    35 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, QuickLook, QLTypeCopyBestMimeTypeForFileNameAndMimeType, NSString *, (NSString *fileName, NSString *mimeType), (fileName, mimeType))
    36 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, QuickLook, QLTypeCopyBestMimeTypeForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
    37 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, QuickLook, QLTypeCopyUTIForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
     34SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, QuickLook, QLItem, PAL_EXPORT)
     35SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, QuickLook, QLPreviewController, PAL_EXPORT)
     36SOFT_LINK_CLASS_FOR_SOURCE(PAL, QuickLook, QLPreviewConverter)
     37SOFT_LINK_CONSTANT_FOR_SOURCE(PAL, QuickLook, kQLPreviewOptionPasswordKey, CFStringRef);
     38SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, QuickLook, QLPreviewGetSupportedMIMETypes, NSSet *, (), ())
     39SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, QuickLook, QLTypeCopyBestMimeTypeForFileNameAndMimeType, NSString *, (NSString *fileName, NSString *mimeType), (fileName, mimeType))
     40SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, QuickLook, QLTypeCopyBestMimeTypeForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
     41SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, QuickLook, QLTypeCopyUTIForURLAndMimeType, NSString *, (NSURL *url, NSString *mimeType), (url, mimeType))
    3842
    3943#endif // USE(QUICK_LOOK)

  • trunk/Source/WebCore/SourcesCocoa.txt

    r240183 r240272  
    411411platform/ios/PlaybackSessionInterfaceAVKit.mm @no-unify
    412412platform/ios/QuickLook.mm
    413 platform/ios/QuickLookSoftLink.mm @no-unify
    414413platform/ios/RemoteCommandListenerIOS.mm
    415414platform/ios/ScrollAnimatorIOS.mm

  • trunk/Source/WebCore/UnifiedSources-input.xcfilelist

    r239976 r240272  
    29912991$(SRCROOT)/platform/ios/PlaybackSessionInterfaceAVKit.mm
    29922992$(SRCROOT)/platform/ios/QuickLook.mm
    2993 $(SRCROOT)/platform/ios/QuickLookSoftLink.mm
    29942993$(SRCROOT)/platform/ios/RemoteCommandListenerIOS.mm
    29952994$(SRCROOT)/platform/ios/ScrollAnimatorIOS.mm

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r240239 r240272  
    809809                2D8FEBDD143E3EF70072502B /* CSSCrossfadeValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8FEBDB143E3EF70072502B /* CSSCrossfadeValue.h */; };
    810810                2D9066070BE141D400956998 /* RenderLayoutState.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9066050BE141D400956998 /* RenderLayoutState.h */; settings = {ATTRIBUTES = (Private, ); }; };
    811                 2D92A79A2134AD7900F493FD /* QuickLookSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 443917FD1A91B2F8006E04F2 /* QuickLookSoftLink.mm */; };
    812811                2D93AEE319DF5641002A86C3 /* ServicesOverlayController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D93AEE119DF5641002A86C3 /* ServicesOverlayController.h */; };
    813812                2D97F04719DD413C001EE9C3 /* MockPageOverlayClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DAAE32C19DCAF6000E002D2 /* MockPageOverlayClient.cpp */; };
    … …  
    12161215                43EDD67F1B485DBF00640E75 /* CombinedFiltersAlphabet.h in Headers */ = {isa = PBXBuildFile; fileRef = 43EDD67D1B485DBF00640E75 /* CombinedFiltersAlphabet.h */; settings = {ATTRIBUTES = (Private, ); }; };
    12171216                4415292E0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4415292C0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1218                 443918001A91B2F8006E04F2 /* QuickLookSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 443917FE1A91B2F8006E04F2 /* QuickLookSoftLink.h */; };
    12191217                445775E520472F73008DCE5D /* LocalDefaultSystemAppearance.h in Headers */ = {isa = PBXBuildFile; fileRef = 445775E420472F73008DCE5D /* LocalDefaultSystemAppearance.h */; settings = {ATTRIBUTES = (Private, ); }; };
    12201218                4471710E205AF945000A116E /* MediaQueryParserContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 4471710C205AF945000A116E /* MediaQueryParserContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    76487646                4415292D0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLPlugInImageElement.cpp; sourceTree = "<group>"; };
    76497647                442956CA218A6D300080DB54 /* DictionaryLookupLegacy.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = DictionaryLookupLegacy.mm; sourceTree = "<group>"; };
    7650                 443917FD1A91B2F8006E04F2 /* QuickLookSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickLookSoftLink.mm; sourceTree = "<group>"; };
    7651                 443917FE1A91B2F8006E04F2 /* QuickLookSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookSoftLink.h; sourceTree = "<group>"; };
    76527648                443F04260E75C8FB007E5407 /* NetworkStateNotifierIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkStateNotifierIOS.mm; sourceTree = "<group>"; };
    76537649                444D4E210F708B2E003158E0 /* WebCoreURLResponseIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreURLResponseIOS.mm; sourceTree = "<group>"; };
    … …  
    2242922425                                A15E31F11E0CB0AA004B371C /* QuickLook.h */,
    2243022426                                A15E31F21E0CB0AA004B371C /* QuickLook.mm */,
    22431                                 443917FE1A91B2F8006E04F2 /* QuickLookSoftLink.h */,
    22432                                 443917FD1A91B2F8006E04F2 /* QuickLookSoftLink.mm */,
    2243322427                                CDFC360118CA61630026E56F /* RemoteCommandListenerIOS.h */,
    2243422428                                CDFC360218CA61630026E56F /* RemoteCommandListenerIOS.mm */,
    … …  
    3106231056                                83C1F5941EDF69D300410D27 /* QualifiedNameCache.h in Headers */,
    3106331057                                A15E31F41E0CB0B5004B371C /* QuickLook.h in Headers */,
    31064                                 443918001A91B2F8006E04F2 /* QuickLookSoftLink.h in Headers */,
    3106531058                                072AE1E8183C0741000A5988 /* QuickTimePluginReplacement.h in Headers */,
    3106631059                                379E371713736A6600B9E919 /* QuotedPrintable.h in Headers */,
    … …  
    3285232845                                CDA29A301CBF74D400901CCF /* PlaybackSessionInterfaceAVKit.mm in Sources */,
    3285332846                                CDA29A161CBDA56C00901CCF /* PlaybackSessionInterfaceMac.mm in Sources */,
    32854                                 2D92A79A2134AD7900F493FD /* QuickLookSoftLink.mm in Sources */,
    3285532847                                419242492127B93E00634FCF /* RealtimeOutgoingVideoSourceCocoa.mm in Sources */,
    3285632848                                316DCB8A1E7A6996001B5F87 /* RTCIceTransport.cpp in Sources */,

  • trunk/Source/WebCore/platform/ios/QuickLook.mm

    r233668 r240272  
    3333#import "ResourceRequest.h"
    3434#import "SchemeRegistry.h"
     35#import <pal/ios/QuickLookSoftLink.h>
    3536#import <pal/spi/cocoa/NSFileManagerSPI.h>
    3637#import <wtf/Lock.h>
    3738#import <wtf/NeverDestroyed.h>
    38 
    39 #import "QuickLookSoftLink.h"
    4039
    4140namespace WebCore {
    … …  
    4544NSSet *QLPreviewGetSupportedMIMETypesSet()
    4645{
    47     static NSSet *set = [QLPreviewGetSupportedMIMETypes() retain];
     46    static NSSet *set = [PAL::softLink_QuickLook_QLPreviewGetSupportedMIMETypes() retain];
    4847    return set;
    4948}
    … …  
    8180RetainPtr<NSURLRequest> registerQLPreviewConverterIfNeeded(NSURL *url, NSString *mimeType, NSData *data)
    8281{
    83     RetainPtr<NSString> updatedMIMEType = adoptNS(QLTypeCopyBestMimeTypeForURLAndMimeType(url, mimeType));
     82    RetainPtr<NSString> updatedMIMEType = adoptNS(PAL::softLink_QuickLook_QLTypeCopyBestMimeTypeForURLAndMimeType(url, mimeType));
    8483
    8584    if ([QLPreviewGetSupportedMIMETypesSet() containsObject:updatedMIMEType.get()]) {
    86         RetainPtr<NSString> uti = adoptNS(QLTypeCopyUTIForURLAndMimeType(url, updatedMIMEType.get()));
     85        RetainPtr<NSString> uti = adoptNS(PAL::softLink_QuickLook_QLTypeCopyUTIForURLAndMimeType(url, updatedMIMEType.get()));
    8786
    8887        auto converter = std::make_unique<PreviewConverter>(data, uti.get());

  • trunk/Source/WebCore/platform/network/ios/PreviewConverter.mm

    r233668 r240272  
    3131#import "ResourceRequest.h"
    3232#import "ResourceResponse.h"
     33#import <pal/ios/QuickLookSoftLink.h>
    3334#import <pal/spi/ios/QuickLookSPI.h>
    34 #import <wtf/SoftLinking.h>
    35 
    36 SOFT_LINK_FRAMEWORK(QuickLook);
    37 SOFT_LINK_CLASS(QuickLook, QLPreviewConverter);
    38 SOFT_LINK_CONSTANT(QuickLook, kQLPreviewOptionPasswordKey, CFStringRef);
    3935
    4036namespace WebCore {
    … …  
    4541        return nil;
    4642
    47     return @{ (NSString *)getkQLPreviewOptionPasswordKey() : password };
     43    return @{ (NSString *)PAL::get_QuickLook_kQLPreviewOptionPasswordKey() : password };
    4844}
    4945
    5046PreviewConverter::PreviewConverter(id delegate, const ResourceResponse& response, const String& password)
    51     : m_platformConverter { adoptNS([allocQLPreviewConverterInstance() initWithConnection:nil delegate:delegate response:response.nsURLResponse() options:optionsWithPassword(password)]) }
     47    : m_platformConverter { adoptNS([PAL::allocQLPreviewConverterInstance() initWithConnection:nil delegate:delegate response:response.nsURLResponse() options:optionsWithPassword(password)]) }
    5248{
    5349}
    5450
    5551PreviewConverter::PreviewConverter(NSData *data, const String& uti, const String& password)
    56     : m_platformConverter { adoptNS([allocQLPreviewConverterInstance() initWithData:data name:nil uti:uti options:optionsWithPassword(password)]) }
     52    : m_platformConverter { adoptNS([PAL::allocQLPreviewConverterInstance() initWithData:data name:nil uti:uti options:optionsWithPassword(password)]) }
    5753{
    5854}

  • trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm

    r239037 r240272  
    3535#import "UTIUtilities.h"
    3636#import <MobileCoreServices/MobileCoreServices.h>
    37 
    38 #import "QuickLookSoftLink.h"
     37#import <pal/ios/QuickLookSoftLink.h>
    3938
    4039namespace WebCore {
    … …  
    8382    if (isMainResourceLoad && shouldUseQuickLookForMIMEType((NSString *)updatedMIMEType.get())) {
    8483        RetainPtr<CFStringRef> suggestedFilename = adoptCF(CFURLResponseCopySuggestedFilename(cfResponse));
    85         RetainPtr<CFStringRef> quickLookMIMEType = adoptCF((CFStringRef)QLTypeCopyBestMimeTypeForFileNameAndMimeType((NSString *)suggestedFilename.get(), (NSString *)mimeType.get()));
     84        RetainPtr<CFStringRef> quickLookMIMEType = adoptCF((CFStringRef)PAL::softLink_QuickLook_QLTypeCopyBestMimeTypeForFileNameAndMimeType((NSString *)suggestedFilename.get(), (NSString *)mimeType.get()));
    8685        if (!quickLookMIMEType) {
    8786            auto url = CFURLResponseGetURL(cfResponse);

  • trunk/Source/WebKit/ChangeLog

    r240251 r240272  
     12019-01-22  David Kilzer  <ddkilzer@apple.com>
     2
     3        Switch remaining QuickLook soft-linking in WebCore, WebKit over to QuickLookSoftLink.{cpp,h}
     4        <https://webkit.org/b/193654>
     5        <rdar://problem/47430290>
     6
     7        Reviewed by Alex Christensen.
     8
     9        - Moves QuickLookSoftLink.{h,mm} to PAL.
     10        - Adds soft-link to 3 classes to consolidate QuickLook.framework
     11          soft-linking.
     12        - Updates existing source to work with above changes.
     13
     14        * UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
     15        (-[_WKPreviewControllerDataSource previewController:previewItemAtIndex:]):
     16        (WebKit::SystemPreviewController::start):
     17        * UIProcess/ios/WKSystemPreviewView.mm:
     18        (-[WKSystemPreviewView web_setContentProviderData:suggestedFilename:]):
     19        - Switch to using QuickLookSoftLink.{h,mm} in PAL.
     20
    1212019-01-22  Oriol Brufau  <obrufau@igalia.com>
    222

  • trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm

    r238771 r240272  
    11/*
    2  * Copyright (C) 2018 Apple Inc. All rights reserved.
     2 * Copyright (C) 2018-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3535#import <UIKit/UIViewController.h>
    3636#import <WebCore/MIMETypeRegistry.h>
     37#import <pal/ios/QuickLookSoftLink.h>
    3738#import <pal/spi/ios/QuickLookSPI.h>
    38 #import <wtf/SoftLinking.h>
    3939#import <wtf/WeakObjCPtr.h>
    40 
    41 SOFT_LINK_FRAMEWORK(QuickLook)
    42 SOFT_LINK_CLASS(QuickLook, QLPreviewController);
    43 SOFT_LINK_CLASS(QuickLook, QLItem);
    4440
    4541@interface _WKPreviewControllerDataSource : NSObject <QLPreviewControllerDataSource> {
    … …  
    8985    static NSString *contentType = (__bridge NSString *) UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, CFSTR("usdz"), nil);
    9086
    91     _item = adoptNS([allocQLItemInstance() initWithPreviewItemProvider:_itemProvider.get() contentType:contentType previewTitle:@"Preview" fileSize:@(0)]);
     87    _item = adoptNS([PAL::allocQLItemInstance() initWithPreviewItemProvider:_itemProvider.get() contentType:contentType previewTitle:@"Preview" fileSize:@(0)]);
    9288    [_item setUseLoadingTimeout:NO];
    9389
    … …  
    205201        return;
    206202
    207     m_qlPreviewController = adoptNS([allocQLPreviewControllerInstance() init]);
     203    m_qlPreviewController = adoptNS([PAL::allocQLPreviewControllerInstance() init]);
    208204
    209205    m_qlPreviewControllerDelegate = adoptNS([[_WKPreviewControllerDelegate alloc] initWithSystemPreviewController:this fromRect:fromRect]);

  • trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm

    r235651 r240272  
    11/*
    2  * Copyright (C) 2018 Apple Inc. All rights reserved.
     2 * Copyright (C) 2018-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3737#import <WebCore/LocalizedStrings.h>
    3838#import <WebCore/MIMETypeRegistry.h>
     39#import <pal/ios/QuickLookSoftLink.h>
    3940#import <pal/spi/cg/CoreGraphicsSPI.h>
    4041#import <pal/spi/ios/SystemPreviewSPI.h>
    4142#import <wtf/RetainPtr.h>
    42 #import <wtf/SoftLinking.h>
    4343#import <wtf/Vector.h>
    44 
    45 SOFT_LINK_FRAMEWORK(QuickLook);
    46 SOFT_LINK_CLASS(QuickLook, QLItem);
    4744
    4845SOFT_LINK_PRIVATE_FRAMEWORK(AssetViewer);
    … …  
    106103    NSString *contentType = getUTIForSystemPreviewMIMEType(_mimeType.get());
    107104
    108     _item = adoptNS([allocQLItemInstance() initWithDataProvider:self contentType:contentType previewTitle:_suggestedFilename.get()]);
     105    _item = adoptNS([PAL::allocQLItemInstance() initWithDataProvider:self contentType:contentType previewTitle:_suggestedFilename.get()]);
    109106    [_item setUseLoadingTimeout:NO];
    110107
Note: See TracChangeset for help on using the changeset viewer.