Changeset 260581 in webkit
- Timestamp:
- Apr 23, 2020 10:48:58 AM (4 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 2 added
- 4 edited
-
ChangeLog (modified) (1 diff)
-
Configurations/WebKit.xcconfig (modified) (1 diff)
-
UIProcess/QuickLookThumbnailLoader.mm (modified) (3 diffs)
-
UIProcess/QuickLookThumbnailingSoftLink.h (added)
-
UIProcess/QuickLookThumbnailingSoftLink.mm (added)
-
WebKit.xcodeproj/project.pbxproj (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r260574 r260581 1 2020-04-23 Nikos Mouchtaris <nmouchtaris@apple.com> 2 3 Soft link QuickLookThumbnailing framework 4 https://bugs.webkit.org/show_bug.cgi?id=210894 5 6 Reviewed by Megan Gardner. 7 8 Soft link QuickLookThumbnailing framework to solve build error. 9 10 No new tests. Unnecessary. 11 12 * Configurations/WebKit.xcconfig: 13 * UIProcess/QuickLookThumbnailLoader.mm: 14 (-[WKQLThumbnailLoadOperation initWithURL:identifier:]): 15 (-[WKQLThumbnailLoadOperation start]): 16 * UIProcess/QuickLookThumbnailingSPI.h: Added. 17 * UIProcess/QuickLookThumbnailingSoftLink.h: Added. 18 * UIProcess/QuickLookThumbnailingSoftLink.mm: Added. 19 * WebKit.xcodeproj/project.pbxproj: 20 1 21 2020-04-23 Chris Dumez <cdumez@apple.com> 2 22 -
trunk/Source/WebKit/Configurations/WebKit.xcconfig
r260558 r260581 125 125 WK_AUTHKIT_LDFLAGS_MACOS_SINCE_1015 = -framework AuthKit; 126 126 127 WK_QUICKLOOK_THUMBNAILING_LDFLAGS = $(WK_QUICKLOOK_THUMBNAILING_LDFLAGS_$(WK_PLATFORM_NAME)); 128 WK_QUICKLOOK_THUMBNAILING_LDFLAGS_macosx = $(WK_QUICKLOOK_THUMBNAILING_LDFLAGS$(WK_MACOS_1015)); 129 WK_QUICKLOOK_THUMBNAILING_LDFLAGS_MACOS_SINCE_1015 = -framework QuickLookThumbnailing; 130 WK_QUICKLOOK_THUMBNAILING_LDFLAGS_iphoneos = -framework QuickLookThumbnailing; 131 WK_QUICKLOOK_THUMBNAILING_LDFLAGS_iphonesimulator = -framework QuickLookThumbnailing; 132 WK_QUICKLOOK_THUMBNAILING_LDFLAGS_maccatalyst = -framework QuickLookThumbnailing; 133 134 FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework IOSurface -framework WebKitLegacy -lnetwork $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_ASSERTION_SERVICES_LDFLAGS) $(WK_RUNNINGBOARD_SERVICES_LDFLAGS) $(WK_AUTHKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS) $(WK_QUICKLOOK_THUMBNAILING_LDFLAGS); 127 FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework IOSurface -framework WebKitLegacy -lnetwork $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_ASSERTION_SERVICES_LDFLAGS) $(WK_RUNNINGBOARD_SERVICES_LDFLAGS) $(WK_AUTHKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS); 135 128 136 129 // Prevent C++ standard library basic_stringstream, operator new, delete and their related exception types from being exported as weak symbols. -
trunk/Source/WebKit/UIProcess/QuickLookThumbnailLoader.mm
r260558 r260581 29 29 #if HAVE(QUICKLOOK_THUMBNAILING) 30 30 31 #import <QuickLookThumbnailing/QLThumbnailGenerator.h> 31 #import "QuickLookThumbnailingSoftLink.h" 32 32 33 #import <wtf/FileSystem.h> 33 34 … … 92 93 NSError *error = nil; 93 94 94 auto fileURLPath = adoptNS([NSURL fileURLWithPath:filePath]);95 auto fileURLPath = [NSURL fileURLWithPath:filePath]; 95 96 96 [_fileWrapper writeToURL:fileURLPath .get()options:options originalContentsURL:nil error:&error];97 [_fileWrapper writeToURL:fileURLPath options:options originalContentsURL:nil error:&error]; 97 98 _filePath = WTFMove(fileURLPath); 98 99 if (error) … … 100 101 } 101 102 102 QLThumbnailGenerationRequest *req = [[QLThumbnailGenerationRequest alloc] initWithFileAtURL:_filePath.get() size:CGSizeMake(400, 400) scale:1 representationTypes:QLThumbnailGenerationRequestRepresentationTypeAll];103 req.iconMode = YES;103 auto req = adoptNS([WebKit::allocQLThumbnailGenerationRequestInstance() initWithFileAtURL:_filePath.get() size:CGSizeMake(400, 400) scale:1 representationTypes:QLThumbnailGenerationRequestRepresentationTypeAll]); 104 [req setIconMode:YES]; 104 105 105 [[ QLThumbnailGenerator sharedGenerator] generateBestRepresentationForRequest:reqcompletionHandler:^(QLThumbnailRepresentation *thumbnail, NSError *error) {106 [[WebKit::getQLThumbnailGeneratorClass() sharedGenerator] generateBestRepresentationForRequest:req.get() completionHandler:^(QLThumbnailRepresentation *thumbnail, NSError *error) { 106 107 if (error) 107 108 return; -
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
r260558 r260581 166 166 1A07D2FB1919B3A900ECDA16 /* parser.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08571187CE0A900780D86 /* parser.py */; }; 167 167 1A0C225E243575CD00ED614D /* QuickLookThumbnailLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AEE57242409F142002005D6 /* QuickLookThumbnailLoader.mm */; }; 168 1A0C227E2451130A00ED614D /* QuickLookThumbnailingSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0C227C2451130A00ED614D /* QuickLookThumbnailingSoftLink.h */; }; 169 1A0C227F2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A0C227D2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm */; }; 168 170 1A0EC603124A9F2C007EF4A5 /* PluginProcessManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC601124A9F2C007EF4A5 /* PluginProcessManager.h */; }; 169 171 1A0EC6C0124BBD9B007EF4A5 /* PluginProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC6BE124BBD9B007EF4A5 /* PluginProcessMessages.h */; }; … … 2284 2286 1A08FEE21D593CF1008BA8CB /* WebPluginInfoProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPluginInfoProvider.cpp; sourceTree = "<group>"; }; 2285 2287 1A08FEE31D593CF1008BA8CB /* WebPluginInfoProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginInfoProvider.h; sourceTree = "<group>"; }; 2288 1A0C227C2451130A00ED614D /* QuickLookThumbnailingSoftLink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QuickLookThumbnailingSoftLink.h; sourceTree = "<group>"; }; 2289 1A0C227D2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickLookThumbnailingSoftLink.mm; sourceTree = "<group>"; }; 2286 2290 1A0EC601124A9F2C007EF4A5 /* PluginProcessManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessManager.h; sourceTree = "<group>"; }; 2287 2291 1A0EC602124A9F2C007EF4A5 /* PluginProcessManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginProcessManager.cpp; sourceTree = "<group>"; }; … … 8938 8942 4683569B21E81CC7006E27A3 /* ProvisionalPageProxy.cpp */, 8939 8943 4683569A21E81CC7006E27A3 /* ProvisionalPageProxy.h */, 8944 1A0C227C2451130A00ED614D /* QuickLookThumbnailingSoftLink.h */, 8945 1A0C227D2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm */, 8940 8946 1AEE57232409F142002005D6 /* QuickLookThumbnailLoader.h */, 8941 8947 1AEE57242409F142002005D6 /* QuickLookThumbnailLoader.mm */, … … 11006 11012 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 11007 11013 A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */, 11014 1A0C227E2451130A00ED614D /* QuickLookThumbnailingSoftLink.h in Headers */, 11008 11015 1AEE57252409F142002005D6 /* QuickLookThumbnailLoader.h in Headers */, 11009 11016 57FD318222B3515E008D0E8B /* RedirectSOAuthorizationSession.h in Headers */, … … 12746 12753 2D54C31B212F4DA60049C174 /* ProcessLauncher.cpp in Sources */, 12747 12754 CD2865EF2255562000606AC7 /* ProcessTaskStateObserver.mm in Sources */, 12755 1A0C227F2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm in Sources */, 12748 12756 1A0C225E243575CD00ED614D /* QuickLookThumbnailLoader.mm in Sources */, 12749 12757 9B1229CE23FF25F2008CA751 /* RemoteAudioDestinationManager.cpp in Sources */,
Note: See TracChangeset
for help on using the changeset viewer.
