Changeset 237610 in webkit


Ignore:
Timestamp:
Oct 30, 2018, 5:15:41 PM (6 years ago)
Author:
ap@apple.com
Message:

Enable InstallAPI for iOS unconditionally
​https://bugs.webkit.org/show_bug.cgi?id=191043
rdar://problem/32728423

Reviewed by Dan Bernstein.

Source/WebKit:

  • Configurations/Base.xcconfig: Enabled it. Added NSURLDownloadSPI.h as an

excluded header - WebKit doesn't export NSURLDownload, so the definition
shouldn't be processed by InstallAPI.

Source/WebKitLegacy:

  • WebKitLegacy.xcodeproj/project.pbxproj: Added NSURLDownloadSPI.h.

Source/WebKitLegacy/mac:

  • Configurations/WebKitLegacy.xcconfig: Enabled it. Added NSURLDownloadSPI.h as an

excluded header - WebKitLegacy doesn't export NSURLDownload, so the definition
shouldn't be processed by InstallAPI.

  • MigrateHeaders.make: Removed an obsolete workaround.
  • Misc/NSURLDownloadSPI.h: Added.
  • Misc/WebDownload.h: Use NSURLDownloadSPI.h instead of defining SPI inline.
Location:
trunk/Source
Files:
1 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r237607 r237610  
     12018-10-30  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Enable InstallAPI for iOS unconditionally
     4        https://bugs.webkit.org/show_bug.cgi?id=191043
     5        rdar://problem/32728423
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * Configurations/Base.xcconfig: Enabled it. Added NSURLDownloadSPI.h as an
     10        excluded header - WebKit doesn't export NSURLDownload, so the definition
     11        shouldn't be processed by InstallAPI.
     12
    1132018-10-30  Alexey Proskuryakov  <ap@apple.com>
    214

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

    r237606 r237610  
    125125OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
    126126
    127 SUPPORTS_TEXT_BASED_API[sdk=iphone*] = $(USE_INTERNAL_SDK);
     127SUPPORTS_TEXT_BASED_API[sdk=iphone*] = YES;
    128128SUPPORTS_TEXT_BASED_API[sdk=appletv*] = NO;
    129129SUPPORTS_TEXT_BASED_API[sdk=watch*] = NO;

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

    r237606 r237610  
    140140// FIXME: Remove -reexport_install_name once rdar://problem/30820233 is fixed.
    141141OTHER_TAPI_FLAGS = $(OTHER_TAPI_FLAGS_$(WK_COCOA_TOUCH));
    142 OTHER_TAPI_FLAGS_cocoatouch = $(inherited) -reexport_install_name $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebKitLegacy.framework/WebKitLegacy -extra-private-header $(SRCROOT)/Platform/ExtraPrivateSymbolsForTAPI.h -extra-public-header $(SRCROOT)/Platform/ExtraPublicSymbolsForTAPI.h;
     142OTHER_TAPI_FLAGS_cocoatouch = $(inherited) -reexport_install_name $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebKitLegacy.framework/WebKitLegacy -extra-private-header $(SRCROOT)/Platform/ExtraPrivateSymbolsForTAPI.h -extra-public-header $(SRCROOT)/Platform/ExtraPublicSymbolsForTAPI.h -exclude-private-header $(BUILT_PRODUCTS_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/NSURLDownloadSPI.h;
    143143
    144144SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION));

  • trunk/Source/WebKitLegacy/ChangeLog

    r237606 r237610  
     12018-10-30  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Enable InstallAPI for iOS unconditionally
     4        https://bugs.webkit.org/show_bug.cgi?id=191043
     5        rdar://problem/32728423
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * WebKitLegacy.xcodeproj/project.pbxproj: Added NSURLDownloadSPI.h.
     10
    1112018-10-30  Commit Queue  <commit-queue@webkit.org>
    212

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

    r237606 r237610  
    788788                DD89682109AA87240097E7F0 /* WebElementDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = DD89681F09AA87240097E7F0 /* WebElementDictionary.mm */; };
    789789                E13E782C1E5A7365001849D1 /* WebCreateFragmentInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = E13E782B1E5A7365001849D1 /* WebCreateFragmentInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
     790                E1531BD82187B954002E3F81 /* NSURLDownloadSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E1531BD72187B8F2002E3F81 /* NSURLDownloadSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
    790791                E15663190FB61C1F00C199CA /* WebDownload.mm in Sources */ = {isa = PBXBuildFile; fileRef = E15663180FB61C1F00C199CA /* WebDownload.mm */; };
    791792                E169836211346D1B00894115 /* ProxyRuntimeObject.h in Headers */ = {isa = PBXBuildFile; fileRef = E169836111346D1B00894115 /* ProxyRuntimeObject.h */; };
    … …  
    15461547                DD89681F09AA87240097E7F0 /* WebElementDictionary.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebElementDictionary.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    15471548                E13E782B1E5A7365001849D1 /* WebCreateFragmentInternal.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = WebCreateFragmentInternal.h; sourceTree = "<group>"; };
     1549                E1531BD72187B8F2002E3F81 /* NSURLDownloadSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSURLDownloadSPI.h; sourceTree = "<group>"; };
    15481550                E15663180FB61C1F00C199CA /* WebDownload.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDownload.mm; sourceTree = "<group>"; };
    15491551                E169836111346D1B00894115 /* ProxyRuntimeObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProxyRuntimeObject.h; sourceTree = "<group>"; };
    … …  
    17741776                        children = (
    17751777                                A10C1D2018202FAF0036883A /* ios */,
     1778                                E1531BD72187B8F2002E3F81 /* NSURLDownloadSPI.h */,
    17761779                                29AEF95D134C755400FE5096 /* OutlookQuirksUserScript.js */,
    17771780                                5241ADF30B1BC48A004012BD /* WebCache.h */,
    … …  
    27832786                                93D436AC1D57ABEE00AB85EA /* DOMExtensions.h in Headers */,
    27842787                                93D436AD1D57ABEE00AB85EA /* DOMFile.h in Headers */,
     2788                                E1531BD82187B954002E3F81 /* NSURLDownloadSPI.h in Headers */,
    27852789                                93D436AF1D57ABEE00AB85EA /* DOMFileInternal.h in Headers */,
    27862790                                93D436B01D57ABEE00AB85EA /* DOMFileList.h in Headers */,

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r237607 r237610  
     12018-10-30  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Enable InstallAPI for iOS unconditionally
     4        https://bugs.webkit.org/show_bug.cgi?id=191043
     5        rdar://problem/32728423
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * Configurations/WebKitLegacy.xcconfig: Enabled it. Added NSURLDownloadSPI.h as an
     10        excluded header - WebKitLegacy doesn't export NSURLDownload, so the definition
     11        shouldn't be processed by InstallAPI.
     12        * MigrateHeaders.make: Removed an obsolete workaround.
     13        * Misc/NSURLDownloadSPI.h: Added.
     14        * Misc/WebDownload.h: Use NSURLDownloadSPI.h instead of defining SPI inline.
     15
    1162018-10-30  Alexey Proskuryakov  <ap@apple.com>
    217

  • trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig

    r237606 r237610  
    136136WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
    137137
    138 // FIXME: Enable TAPI in open source builds once <rdar://problem/24582471> is fixed in all supported SDKs.
    139 SUPPORTS_TEXT_BASED_API[sdk=iphone*] = $(USE_INTERNAL_SDK);
     138SUPPORTS_TEXT_BASED_API[sdk=iphone*] = YES;
    140139SUPPORTS_TEXT_BASED_API[sdk=appletv*] = NO;
    141140SUPPORTS_TEXT_BASED_API[sdk=watch*] = NO;
    142 OTHER_TAPI_FLAGS[sdk=iphone*] = -x objective-c++ -std=c++17 -fno-rtti -DRELEASE_WITHOUT_OPTIMIZATIONS;
     141OTHER_TAPI_FLAGS[sdk=iphone*] = -x objective-c++ -std=c++17 -fno-rtti -DRELEASE_WITHOUT_OPTIMIZATIONS -exclude-private-header $(BUILT_PRODUCTS_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/NSURLDownloadSPI.h;
    143142TAPI_VERIFY_MODE[sdk=iphone*] = Pedantic;

  • trunk/Source/WebKitLegacy/mac/MigrateHeaders.make

    r237606 r237610  
    8888
    8989TAPI_PATH = $(strip $(shell xcrun --find tapi 2>/dev/null))
    90 ifneq (,$(TAPI_PATH))
    91 REEXPORT_COMMAND = $(TAPI_PATH) reexport -arch $(WK_CURRENT_ARCH) -$(DEPLOYMENT_TARGET_CLANG_FLAG_NAME)=$($(DEPLOYMENT_TARGET_CLANG_ENV_NAME)) -isysroot $(SDK_DIR) $(HEADER_FLAGS) $(FRAMEWORK_FLAGS) $^ -o $@
    92 else
    93 # Temporary stub for SDKs that don't have the tapi command, <rdar://problem/24582471>.
    94 REEXPORT_COMMAND = touch $@
    95 endif
    9690
    9791$(REEXPORT_FILE) : $(HEADERS)
    98         $(REEXPORT_COMMAND)
     92        $(TAPI_PATH) reexport -arch $(WK_CURRENT_ARCH) -$(DEPLOYMENT_TARGET_CLANG_FLAG_NAME)=$($(DEPLOYMENT_TARGET_CLANG_ENV_NAME)) -isysroot $(SDK_DIR) $(HEADER_FLAGS) $(FRAMEWORK_FLAGS) $^ -o $@
    9993
    10094else

  • trunk/Source/WebKitLegacy/mac/Misc/WebDownload.h

    r237606 r237610  
    3636#import <Foundation/NSURLDownload.h>
    3737#else
    38 @interface NSURLDownload : NSObject
    39 @end
    40 
    41 @protocol NSURLDownloadDelegate;
     38#import <WebKitLegacy/NSURLDownloadSPI.h>
    4239#endif
    4340
Note: See TracChangeset for help on using the changeset viewer.