Changeset 260558 in webkit


Ignore:
Timestamp:
Apr 22, 2020 11:15:29 PM (4 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, reverting r260553.

Broke iOS and Catalina builds.

Reverted changeset:

"Soft link QuickLookThumbnailing framework"
​https://bugs.webkit.org/show_bug.cgi?id=210894
​https://trac.webkit.org/changeset/260553

Location:
trunk/Source/WebKit
Files:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r260554 r260558  
     12020-04-22  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, reverting r260553.
     4
     5        Broke iOS and Catalina builds.
     6
     7        Reverted changeset:
     8
     9        "Soft link QuickLookThumbnailing framework"
     10        https://bugs.webkit.org/show_bug.cgi?id=210894
     11        https://trac.webkit.org/changeset/260553
     12
    1132020-04-22  Darin Adler  <darin@apple.com>
    214

  • trunk/Source/WebKit/Configurations/WebKit.xcconfig

    r260553 r260558  
    125125WK_AUTHKIT_LDFLAGS_MACOS_SINCE_1015 = -framework AuthKit;
    126126
    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);
     127WK_QUICKLOOK_THUMBNAILING_LDFLAGS = $(WK_QUICKLOOK_THUMBNAILING_LDFLAGS_$(WK_PLATFORM_NAME));
     128WK_QUICKLOOK_THUMBNAILING_LDFLAGS_macosx = $(WK_QUICKLOOK_THUMBNAILING_LDFLAGS$(WK_MACOS_1015));
     129WK_QUICKLOOK_THUMBNAILING_LDFLAGS_MACOS_SINCE_1015 = -framework QuickLookThumbnailing;
     130WK_QUICKLOOK_THUMBNAILING_LDFLAGS_iphoneos = -framework QuickLookThumbnailing;
     131WK_QUICKLOOK_THUMBNAILING_LDFLAGS_iphonesimulator = -framework QuickLookThumbnailing;
     132WK_QUICKLOOK_THUMBNAILING_LDFLAGS_maccatalyst = -framework QuickLookThumbnailing;
     133
     134FRAMEWORK_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);
    128135
    129136// 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

    r260553 r260558  
    2929#if HAVE(QUICKLOOK_THUMBNAILING)
    3030
    31 #import "QuickLookThumbnailingSoftLink.h"
    32 
     31#import <QuickLookThumbnailing/QLThumbnailGenerator.h>
    3332#import <wtf/FileSystem.h>
    3433
    … …  
    9392        NSError *error = nil;
    9493       
    95         auto fileURLPath = [NSURL fileURLWithPath:filePath];
     94        auto fileURLPath = adoptNS([NSURL fileURLWithPath:filePath]);
    9695
    9796        [_fileWrapper writeToURL:fileURLPath.get() options:options originalContentsURL:nil error:&error];
    … …  
    101100    }
    102101
    103     auto req = adoptNS([WebKit::allocQLThumbnailGenerationRequestInstance() initWithFileAtURL:_filePath.get() size:CGSizeMake(400, 400) scale:1 representationTypes:QLThumbnailGenerationRequestRepresentationTypeAll]);
    104     [req setIconMode:YES];
     102    QLThumbnailGenerationRequest *req = [[QLThumbnailGenerationRequest alloc] initWithFileAtURL:_filePath.get() size:CGSizeMake(400, 400) scale:1 representationTypes:QLThumbnailGenerationRequestRepresentationTypeAll];
     103    req.iconMode = YES;
    105104   
    106     [[WebKit::getQLThumbnailGeneratorClass() sharedGenerator] generateBestRepresentationForRequest:req.get() completionHandler:^(QLThumbnailRepresentation *thumbnail, NSError *error) {
     105    [[QLThumbnailGenerator sharedGenerator] generateBestRepresentationForRequest:req completionHandler:^(QLThumbnailRepresentation *thumbnail, NSError *error) {
    107106        if (error)
    108107            return;

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

    r260553 r260558  
    166166                1A07D2FB1919B3A900ECDA16 /* parser.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08571187CE0A900780D86 /* parser.py */; };
    167167                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 */; };
    170168                1A0EC603124A9F2C007EF4A5 /* PluginProcessManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC601124A9F2C007EF4A5 /* PluginProcessManager.h */; };
    171169                1A0EC6C0124BBD9B007EF4A5 /* PluginProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC6BE124BBD9B007EF4A5 /* PluginProcessMessages.h */; };
    … …  
    22862284                1A08FEE21D593CF1008BA8CB /* WebPluginInfoProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPluginInfoProvider.cpp; sourceTree = "<group>"; };
    22872285                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>"; };
    22902286                1A0EC601124A9F2C007EF4A5 /* PluginProcessManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessManager.h; sourceTree = "<group>"; };
    22912287                1A0EC602124A9F2C007EF4A5 /* PluginProcessManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginProcessManager.cpp; sourceTree = "<group>"; };
    … …  
    89428938                                4683569B21E81CC7006E27A3 /* ProvisionalPageProxy.cpp */,
    89438939                                4683569A21E81CC7006E27A3 /* ProvisionalPageProxy.h */,
    8944                                 1A0C227C2451130A00ED614D /* QuickLookThumbnailingSoftLink.h */,
    8945                                 1A0C227D2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm */,
    89468940                                1AEE57232409F142002005D6 /* QuickLookThumbnailLoader.h */,
    89478941                                1AEE57242409F142002005D6 /* QuickLookThumbnailLoader.mm */,
    … …  
    1101211006                                83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */,
    1101311007                                A1E688701F6E2BAB007006A6 /* QuarantineSPI.h in Headers */,
    11014                                 1A0C227E2451130A00ED614D /* QuickLookThumbnailingSoftLink.h in Headers */,
    1101511008                                1AEE57252409F142002005D6 /* QuickLookThumbnailLoader.h in Headers */,
    1101611009                                57FD318222B3515E008D0E8B /* RedirectSOAuthorizationSession.h in Headers */,
    … …  
    1275312746                                2D54C31B212F4DA60049C174 /* ProcessLauncher.cpp in Sources */,
    1275412747                                CD2865EF2255562000606AC7 /* ProcessTaskStateObserver.mm in Sources */,
    12755                                 1A0C227F2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm in Sources */,
    1275612748                                1A0C225E243575CD00ED614D /* QuickLookThumbnailLoader.mm in Sources */,
    1275712749                                9B1229CE23FF25F2008CA751 /* RemoteAudioDestinationManager.cpp in Sources */,
Note: See TracChangeset for help on using the changeset viewer.