Changeset 283403 in webkit
- Timestamp:
- Oct 1, 2021, 2:28:10 PM (5 years ago)
- Location:
- trunk/Source
- Files:
-
- 4 deleted
- 7 edited
-
WebKit/ChangeLog (modified) (1 diff)
-
WebKit/mac/MigrateHeadersFromWebKitLegacy.make (modified) (3 diffs)
-
WebKitLegacy/ChangeLog (modified) (1 diff)
-
WebKitLegacy/Modules (deleted)
-
WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (modified) (6 diffs)
-
WebKitLegacy/mac/ChangeLog (modified) (1 diff)
-
WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (modified) (3 diffs)
-
WebKitLegacy/mac/History/WebBackForwardListPrivate.h (modified) (2 diffs)
-
WebKitLegacy/mac/Misc/WebKitLegacy_Private.h (deleted)
-
WebKitLegacy/mac/Misc/WebKitLegacy_iOS_Private.h (deleted)
-
WebKitLegacy/mac/Misc/WebKitLegacy_macOS_Private.h (deleted)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r283397 r283403 1 2021-10-01 Ian Anderson <iana@apple.com> 2 3 WebKitLegacy's module map files don't get installed 4 https://bugs.webkit.org/show_bug.cgi?id=230736 5 6 Reviewed by David Kilzer. 7 8 Revert r271607 because it doesn't work and isn't the right approach. 9 10 * mac/MigrateHeadersFromWebKitLegacy.make: 11 1 12 2021-10-01 Chris Dumez <cdumez@apple.com> 2 13 -
trunk/Source/WebKit/mac/MigrateHeadersFromWebKitLegacy.make
r271607 r283403 1 # Copyright (C) 2006, 2007, 2008, 2014 , 2021Apple Inc. All rights reserved.1 # Copyright (C) 2006, 2007, 2008, 2014 Apple Inc. All rights reserved. 2 2 # Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> 3 3 # … … 204 204 WEBKIT_LEGACY_PUBLIC_HEADERS = $(addprefix $(PUBLIC_HEADERS_DIR)/, $(filter $(WEBKIT_PUBLIC_HEADERS), $(notdir $(wildcard $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/*.h))) WebKitLegacy.h) 205 205 206 WEBKIT_LEGACY_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter-out $(WEBKIT_PUBLIC_HEADERS) $(RECENTLY_REMOVED_WEBKIT_LEGACY_PRIVATE_HEADERS) WebKit.h WebKitLegacy_Private.h WebKitLegacy_iOS_Private.h WebKitLegacy_macOS_Private.h, $(notdir $(wildcard $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/*.h))))206 WEBKIT_LEGACY_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter-out $(WEBKIT_PUBLIC_HEADERS) $(RECENTLY_REMOVED_WEBKIT_LEGACY_PRIVATE_HEADERS) WebKit.h, $(notdir $(wildcard $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/*.h)))) 207 207 208 208 WEBKIT_LEGACY_HEADER_REPLACE_RULES = -e s/\<WebKitLegacy/\<WebKit/ … … 226 226 else 227 227 228 WEBKIT_LEGACY_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter-out $(RECENTLY_REMOVED_WEBKIT_LEGACY_PRIVATE_HEADERS) WebKit.h WebKitLegacy_Private.h WebKitLegacy_iOS_Private.h WebKitLegacy_macOS_Private.h, $(notdir $(wildcard $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/*.h))))228 WEBKIT_LEGACY_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter-out $(RECENTLY_REMOVED_WEBKIT_LEGACY_PRIVATE_HEADERS) WebKit.h, $(notdir $(wildcard $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/*.h)))) 229 229 230 230 all : $(WEBKIT_LEGACY_PRIVATE_HEADERS) $(PUBLIC_HEADERS_DIR)/WebKitLegacy.h -
trunk/Source/WebKitLegacy/ChangeLog
r283237 r283403 1 2021-10-01 Ian Anderson <iana@apple.com> 2 3 WebKitLegacy's module map files don't get installed 4 https://bugs.webkit.org/show_bug.cgi?id=230736 5 6 Reviewed by David Kilzer. 7 8 Revert r271607 because it doesn't work and isn't the right approach. 9 10 * Modules/WebKitLegacy_iOS.private.modulemap: Removed. 11 * Modules/WebKitLegacy_macOS.private.modulemap: Removed. 12 * WebKitLegacy.xcodeproj/project.pbxproj: 13 1 14 2021-09-29 Jer Noble <jer.noble@apple.com> 2 15 -
trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj
r280758 r283403 164 164 535E08CF225463B200DF00CA /* WebKitPluginHost.defs in Copy Mig Files into Private Framework Headers */ = {isa = PBXBuildFile; fileRef = 1AAF588D0EDCCEA3008D883D /* WebKitPluginHost.defs */; }; 165 165 535E08D0225463B200DF00CA /* WebKitPluginHostTypes.defs in Copy Mig Files into Private Framework Headers */ = {isa = PBXBuildFile; fileRef = 1AAF588E0EDCCEA3008D883D /* WebKitPluginHostTypes.defs */; }; 166 5365AEDB2566345800704679 /* WebKitLegacy_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 5365AED92566345800704679 /* WebKitLegacy_Private.h */; settings = {ATTRIBUTES = (Private, ); }; };167 536A202A258B196700E39054 /* WebKitLegacy_macOS_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 536A2028258B196700E39054 /* WebKitLegacy_macOS_Private.h */; settings = {ATTRIBUTES = (Private, ); }; };168 536A202B258B196700E39054 /* WebKitLegacy_iOS_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 536A2029258B196700E39054 /* WebKitLegacy_iOS_Private.h */; settings = {ATTRIBUTES = (Private, ); }; };169 166 598AD91A1201CEC900ABAE4E /* WebDeviceOrientationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 598AD9191201CEC900ABAE4E /* WebDeviceOrientationClient.h */; }; 170 167 598AD91E1201CECF00ABAE4E /* WebDeviceOrientationClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 598AD91D1201CECF00ABAE4E /* WebDeviceOrientationClient.mm */; }; … … 926 923 5241ADF30B1BC48A004012BD /* WebCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCache.h; sourceTree = "<group>"; }; 927 924 5241ADF40B1BC48A004012BD /* WebCache.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCache.mm; sourceTree = "<group>"; }; 928 5365AED92566345800704679 /* WebKitLegacy_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitLegacy_Private.h; sourceTree = "<group>"; };929 536A2028258B196700E39054 /* WebKitLegacy_macOS_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitLegacy_macOS_Private.h; sourceTree = "<group>"; };930 536A2029258B196700E39054 /* WebKitLegacy_iOS_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitLegacy_iOS_Private.h; sourceTree = "<group>"; };931 536A202C258B199500E39054 /* WebKitLegacy_iOS.private.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = WebKitLegacy_iOS.private.modulemap; sourceTree = "<group>"; };932 536A202D258B199600E39054 /* WebKitLegacy_macOS.private.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = WebKitLegacy_macOS.private.modulemap; sourceTree = "<group>"; };933 925 598AD9191201CEC900ABAE4E /* WebDeviceOrientationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDeviceOrientationClient.h; sourceTree = "<group>"; }; 934 926 598AD91D1201CECF00ABAE4E /* WebDeviceOrientationClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDeviceOrientationClient.mm; sourceTree = "<group>"; }; … … 1653 1645 089C1665FE841158C02AAC07 /* Resources */, 1654 1646 7C02320E251B8E3A00BA7BB6 /* Scripts */, 1655 534F75362578AAE8005BE7D8 /* Modules */,1656 1647 0867D69AFE84028FC02AAC07 /* Frameworks and Libraries */, 1657 1648 034768DFFF38A50411DB9C8B /* Products */, … … 1786 1777 83730F9803FB1E660004736E /* WebKitErrors.m */, 1787 1778 84CA5F7E042685E800CA2ACA /* WebKitErrorsPrivate.h */, 1788 536A2029258B196700E39054 /* WebKitLegacy_iOS_Private.h */,1789 536A2028258B196700E39054 /* WebKitLegacy_macOS_Private.h */,1790 5365AED92566345800704679 /* WebKitLegacy_Private.h */,1791 1779 93AEB17D032C1735008635CE /* WebKitLogging.h */, 1792 1780 93AEB17E032C1735008635CE /* WebKitLogging.m */, … … 1931 1919 ); 1932 1920 name = PDF; 1933 sourceTree = "<group>";1934 };1935 534F75362578AAE8005BE7D8 /* Modules */ = {1936 isa = PBXGroup;1937 children = (1938 536A202C258B199500E39054 /* WebKitLegacy_iOS.private.modulemap */,1939 536A202D258B199600E39054 /* WebKitLegacy_macOS.private.modulemap */,1940 );1941 path = Modules;1942 1921 sourceTree = "<group>"; 1943 1922 }; … … 3110 3089 9398106D0824BF01008DF038 /* WebKitErrorsPrivate.h in Headers */, 3111 3090 CD8BFCE815531224005AFB25 /* WebKitFullScreenListener.h in Headers */, 3112 536A202B258B196700E39054 /* WebKitLegacy_iOS_Private.h in Headers */,3113 536A202A258B196700E39054 /* WebKitLegacy_macOS_Private.h in Headers */,3114 5365AEDB2566345800704679 /* WebKitLegacy_Private.h in Headers */,3115 3091 9398101D0824BF01008DF038 /* WebKitLogging.h in Headers */, 3116 3092 9398101E0824BF01008DF038 /* WebKitNSStringExtras.h in Headers */, -
trunk/Source/WebKitLegacy/mac/ChangeLog
r283225 r283403 1 2021-10-01 Ian Anderson <iana@apple.com> 2 3 WebKitLegacy's module map files don't get installed 4 https://bugs.webkit.org/show_bug.cgi?id=230736 5 6 Reviewed by David Kilzer. 7 8 Revert r271607 because it doesn't work and isn't the right approach. 9 10 * Configurations/WebKitLegacy.xcconfig: 11 * History/WebBackForwardListPrivate.h: 12 * Misc/WebKitLegacy_Private.h: Removed. 13 * Misc/WebKitLegacy_iOS_Private.h: Removed. 14 * Misc/WebKitLegacy_macOS_Private.h: Removed. 15 1 16 2021-09-29 Chris Dumez <cdumez@apple.com> 2 17 -
trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
r279282 r283403 1 // Copyright (C) 2009, 2010, 2014, 2019 , 2021Apple Inc. All rights reserved.1 // Copyright (C) 2009, 2010, 2014, 2019 Apple Inc. All rights reserved. 2 2 // 3 3 // Redistribution and use in source and binary forms, with or without … … 27 27 28 28 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_COCOA_TOUCH)); 29 EXCLUDED_SOURCE_FILE_NAMES_cocoatouch = *.defs *.xib *.pdf *.tiff OutlookQuirksUserScript.js PopupMenuMac.* SearchPopupMenuMac.* WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebInspectorClient.* WebJavaScriptTextInputPanel.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebStringTruncator.* WebTextCompletionController.* WebKitLegacy_macOS_Private.h;30 EXCLUDED_SOURCE_FILE_NAMES_ = *IOS.mm WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h DOMHTMLTextAreaElementPrivate.h DOMUIKitExtensions.h LaBanquePostaleQuirks.js WebKitLegacy_iOS_Private.h;29 EXCLUDED_SOURCE_FILE_NAMES_cocoatouch = *.defs *.xib *.pdf *.tiff OutlookQuirksUserScript.js PopupMenuMac.* SearchPopupMenuMac.* WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebInspectorClient.* WebJavaScriptTextInputPanel.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebStringTruncator.* WebTextCompletionController.*; 30 EXCLUDED_SOURCE_FILE_NAMES_ = *IOS.mm WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h DOMHTMLTextAreaElementPrivate.h DOMUIKitExtensions.h LaBanquePostaleQuirks.js; 31 31 32 32 EXPORTED_SYMBOLS_FILE = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp; … … 155 155 SUPPORTS_TEXT_BASED_API[sdk=appletv*] = NO; 156 156 SUPPORTS_TEXT_BASED_API[sdk=watch*] = NO; 157 OTHER_TAPI_FLAGS[sdk=iphone*] = -x objective-c++ -std=gnu++1z -fno-rtti $(WK_CFLAGS_BUILD_FOR_TESTING_$(WK_BUILD_FOR_TESTING)) -DRELEASE_WITHOUT_OPTIMIZATIONS -exclude-private-header $(BUILT_PRODUCTS_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/ WebKitLegacy_iOS_Private.h -exclude-private-header $(BUILT_PRODUCTS_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/NSURLDownloadSPI.h -extra-private-header $(SOURCE_ROOT)/mac/TestingFunctions.h;157 OTHER_TAPI_FLAGS[sdk=iphone*] = -x objective-c++ -std=gnu++1z -fno-rtti $(WK_CFLAGS_BUILD_FOR_TESTING_$(WK_BUILD_FOR_TESTING)) -DRELEASE_WITHOUT_OPTIMIZATIONS -exclude-private-header $(BUILT_PRODUCTS_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/NSURLDownloadSPI.h -extra-private-header $(SOURCE_ROOT)/mac/TestingFunctions.h; 158 158 TAPI_VERIFY_MODE[sdk=iphone*] = Pedantic; 159 160 DEFINES_MODULE = YES;161 CLANG_MODULES_ENABLE_VERIFIER_TOOL = YES;162 MODULEMAP_PRIVATE_FILE = $(MODULEMAP_PRIVATE_FILE_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));163 MODULEMAP_PRIVATE_FILE_COCOA_TOUCH_YES = $(SRCROOT)/Modules/WebKitLegacy_iOS.private.modulemap;164 MODULEMAP_PRIVATE_FILE_COCOA_TOUCH_NO = $(SRCROOT)/Modules/WebKitLegacy_macOS.private.modulemap; -
trunk/Source/WebKitLegacy/mac/History/WebBackForwardListPrivate.h
r271607 r283403 1 1 /* 2 * Copyright (C) 2005 , 2021Apple Inc. All rights reserved.2 * Copyright (C) 2005 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 35 35 @method removeItem: 36 36 @abstract Removes an entry from the list. 37 @param itemThe entry to remove. Cannot be the current item.37 @param entry The entry to remove. Cannot be the current item. 38 38 */ 39 39 - (void)removeItem:(WebHistoryItem *)item;
Note:
See TracChangeset
for help on using the changeset viewer.
