Diff
Modified: trunk/Source/WebKit/ChangeLog (283402 => 283403)
--- trunk/Source/WebKit/ChangeLog 2021-10-01 21:24:36 UTC (rev 283402)
+++ trunk/Source/WebKit/ChangeLog 2021-10-01 21:28:10 UTC (rev 283403)
@@ -1,3 +1,14 @@
+2021-10-01 Ian Anderson <[email protected]>
+
+ WebKitLegacy's module map files don't get installed
+ https://bugs.webkit.org/show_bug.cgi?id=230736
+
+ Reviewed by David Kilzer.
+
+ Revert r271607 because it doesn't work and isn't the right approach.
+
+ * mac/MigrateHeadersFromWebKitLegacy.make:
+
2021-10-01 Chris Dumez <[email protected]>
Unreviewed, reverting r283274.
Modified: trunk/Source/WebKit/mac/MigrateHeadersFromWebKitLegacy.make (283402 => 283403)
--- trunk/Source/WebKit/mac/MigrateHeadersFromWebKitLegacy.make 2021-10-01 21:24:36 UTC (rev 283402)
+++ trunk/Source/WebKit/mac/MigrateHeadersFromWebKitLegacy.make 2021-10-01 21:28:10 UTC (rev 283403)
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2008, 2014, 2021 Apple Inc. All rights reserved.
+# Copyright (C) 2006, 2007, 2008, 2014 Apple Inc. All rights reserved.
# Copyright (C) 2006 Samuel Weinig <[email protected]>
#
# Redistribution and use in source and binary forms, with or without
@@ -203,7 +203,7 @@
WEBKIT_LEGACY_PUBLIC_HEADERS = $(addprefix $(PUBLIC_HEADERS_DIR)/, $(filter $(WEBKIT_PUBLIC_HEADERS), $(notdir $(wildcard $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/*.h))) WebKitLegacy.h)
-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))))
+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))))
WEBKIT_LEGACY_HEADER_REPLACE_RULES = -e s/\<WebKitLegacy/\<WebKit/
WEBKIT_LEGACY_HEADER_MIGRATE_CMD = sed $(WEBKIT_LEGACY_HEADER_REPLACE_RULES) $< > $@
@@ -225,7 +225,7 @@
else
-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))))
+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))))
all : $(WEBKIT_LEGACY_PRIVATE_HEADERS) $(PUBLIC_HEADERS_DIR)/WebKitLegacy.h
Modified: trunk/Source/WebKitLegacy/ChangeLog (283402 => 283403)
--- trunk/Source/WebKitLegacy/ChangeLog 2021-10-01 21:24:36 UTC (rev 283402)
+++ trunk/Source/WebKitLegacy/ChangeLog 2021-10-01 21:28:10 UTC (rev 283403)
@@ -1,3 +1,16 @@
+2021-10-01 Ian Anderson <[email protected]>
+
+ WebKitLegacy's module map files don't get installed
+ https://bugs.webkit.org/show_bug.cgi?id=230736
+
+ Reviewed by David Kilzer.
+
+ Revert r271607 because it doesn't work and isn't the right approach.
+
+ * Modules/WebKitLegacy_iOS.private.modulemap: Removed.
+ * Modules/WebKitLegacy_macOS.private.modulemap: Removed.
+ * WebKitLegacy.xcodeproj/project.pbxproj:
+
2021-09-29 Jer Noble <[email protected]>
Build-time optimization: forward declare more things in MediaPlayer.h and HTMLMediaElement.h
Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (283402 => 283403)
--- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2021-10-01 21:24:36 UTC (rev 283402)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2021-10-01 21:28:10 UTC (rev 283403)
@@ -163,9 +163,6 @@
535E08CE225463B200DF00CA /* WebKitPluginClient.defs in Copy Mig Files into Private Framework Headers */ = {isa = PBXBuildFile; fileRef = 1AAF588C0EDCCEA3008D883D /* WebKitPluginClient.defs */; };
535E08CF225463B200DF00CA /* WebKitPluginHost.defs in Copy Mig Files into Private Framework Headers */ = {isa = PBXBuildFile; fileRef = 1AAF588D0EDCCEA3008D883D /* WebKitPluginHost.defs */; };
535E08D0225463B200DF00CA /* WebKitPluginHostTypes.defs in Copy Mig Files into Private Framework Headers */ = {isa = PBXBuildFile; fileRef = 1AAF588E0EDCCEA3008D883D /* WebKitPluginHostTypes.defs */; };
- 5365AEDB2566345800704679 /* WebKitLegacy_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 5365AED92566345800704679 /* WebKitLegacy_Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 536A202A258B196700E39054 /* WebKitLegacy_macOS_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 536A2028258B196700E39054 /* WebKitLegacy_macOS_Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 536A202B258B196700E39054 /* WebKitLegacy_iOS_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 536A2029258B196700E39054 /* WebKitLegacy_iOS_Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
598AD91A1201CEC900ABAE4E /* WebDeviceOrientationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 598AD9191201CEC900ABAE4E /* WebDeviceOrientationClient.h */; };
598AD91E1201CECF00ABAE4E /* WebDeviceOrientationClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 598AD91D1201CECF00ABAE4E /* WebDeviceOrientationClient.mm */; };
598AD9201201CF0700ABAE4E /* WebDeviceOrientation.h in Headers */ = {isa = PBXBuildFile; fileRef = 598AD91F1201CF0700ABAE4E /* WebDeviceOrientation.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -925,11 +922,6 @@
51FDC4D20B0AF5C100F84EB3 /* WebHistoryItemPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryItemPrivate.h; sourceTree = "<group>"; };
5241ADF30B1BC48A004012BD /* WebCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCache.h; sourceTree = "<group>"; };
5241ADF40B1BC48A004012BD /* WebCache.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCache.mm; sourceTree = "<group>"; };
- 5365AED92566345800704679 /* WebKitLegacy_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitLegacy_Private.h; sourceTree = "<group>"; };
- 536A2028258B196700E39054 /* WebKitLegacy_macOS_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitLegacy_macOS_Private.h; sourceTree = "<group>"; };
- 536A2029258B196700E39054 /* WebKitLegacy_iOS_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitLegacy_iOS_Private.h; sourceTree = "<group>"; };
- 536A202C258B199500E39054 /* WebKitLegacy_iOS.private.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = WebKitLegacy_iOS.private.modulemap; sourceTree = "<group>"; };
- 536A202D258B199600E39054 /* WebKitLegacy_macOS.private.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = WebKitLegacy_macOS.private.modulemap; sourceTree = "<group>"; };
598AD9191201CEC900ABAE4E /* WebDeviceOrientationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDeviceOrientationClient.h; sourceTree = "<group>"; };
598AD91D1201CECF00ABAE4E /* WebDeviceOrientationClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDeviceOrientationClient.mm; sourceTree = "<group>"; };
598AD91F1201CF0700ABAE4E /* WebDeviceOrientation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDeviceOrientation.h; sourceTree = "<group>"; };
@@ -1652,7 +1644,6 @@
1C68F63F095B5F9C00C2984E /* WebInspector */,
089C1665FE841158C02AAC07 /* Resources */,
7C02320E251B8E3A00BA7BB6 /* Scripts */,
- 534F75362578AAE8005BE7D8 /* Modules */,
0867D69AFE84028FC02AAC07 /* Frameworks and Libraries */,
034768DFFF38A50411DB9C8B /* Products */,
1C904FCE0BA9DCF20081E9D0 /* Configurations */,
@@ -1785,9 +1776,6 @@
F5927D4E02D26C5E01CA2DBB /* WebKitErrors.h */,
83730F9803FB1E660004736E /* WebKitErrors.m */,
84CA5F7E042685E800CA2ACA /* WebKitErrorsPrivate.h */,
- 536A2029258B196700E39054 /* WebKitLegacy_iOS_Private.h */,
- 536A2028258B196700E39054 /* WebKitLegacy_macOS_Private.h */,
- 5365AED92566345800704679 /* WebKitLegacy_Private.h */,
93AEB17D032C1735008635CE /* WebKitLogging.h */,
93AEB17E032C1735008635CE /* WebKitLogging.m */,
1CF18F4226BB71D3004B1722 /* WebKitLogInitialization.h */,
@@ -1932,15 +1920,6 @@
name = PDF;
sourceTree = "<group>";
};
- 534F75362578AAE8005BE7D8 /* Modules */ = {
- isa = PBXGroup;
- children = (
- 536A202C258B199500E39054 /* WebKitLegacy_iOS.private.modulemap */,
- 536A202D258B199600E39054 /* WebKitLegacy_macOS.private.modulemap */,
- );
- path = Modules;
- sourceTree = "<group>";
- };
6508A4A7099B375F00BCBF45 /* Default Delegates */ = {
isa = PBXGroup;
children = (
@@ -3109,9 +3088,6 @@
9398101C0824BF01008DF038 /* WebKitErrors.h in Headers */,
9398106D0824BF01008DF038 /* WebKitErrorsPrivate.h in Headers */,
CD8BFCE815531224005AFB25 /* WebKitFullScreenListener.h in Headers */,
- 536A202B258B196700E39054 /* WebKitLegacy_iOS_Private.h in Headers */,
- 536A202A258B196700E39054 /* WebKitLegacy_macOS_Private.h in Headers */,
- 5365AEDB2566345800704679 /* WebKitLegacy_Private.h in Headers */,
9398101D0824BF01008DF038 /* WebKitLogging.h in Headers */,
9398101E0824BF01008DF038 /* WebKitNSStringExtras.h in Headers */,
1AAF5D090EDDE71D008D883D /* WebKitPluginHostTypes.h in Headers */,
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (283402 => 283403)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2021-10-01 21:24:36 UTC (rev 283402)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2021-10-01 21:28:10 UTC (rev 283403)
@@ -1,3 +1,18 @@
+2021-10-01 Ian Anderson <[email protected]>
+
+ WebKitLegacy's module map files don't get installed
+ https://bugs.webkit.org/show_bug.cgi?id=230736
+
+ Reviewed by David Kilzer.
+
+ Revert r271607 because it doesn't work and isn't the right approach.
+
+ * Configurations/WebKitLegacy.xcconfig:
+ * History/WebBackForwardListPrivate.h:
+ * Misc/WebKitLegacy_Private.h: Removed.
+ * Misc/WebKitLegacy_iOS_Private.h: Removed.
+ * Misc/WebKitLegacy_macOS_Private.h: Removed.
+
2021-09-29 Chris Dumez <[email protected]>
Make WebLocalizedString() thread-safe
Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (283402 => 283403)
--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2021-10-01 21:24:36 UTC (rev 283402)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2021-10-01 21:28:10 UTC (rev 283403)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009, 2010, 2014, 2019, 2021 Apple Inc. All rights reserved.
+// Copyright (C) 2009, 2010, 2014, 2019 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -26,8 +26,8 @@
#include "WebKitTargetConditionals.xcconfig"
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_COCOA_TOUCH));
-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;
-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;
+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.*;
+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;
EXPORTED_SYMBOLS_FILE = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
@@ -154,11 +154,5 @@
SUPPORTS_TEXT_BASED_API[sdk=iphone*] = YES;
SUPPORTS_TEXT_BASED_API[sdk=appletv*] = NO;
SUPPORTS_TEXT_BASED_API[sdk=watch*] = NO;
-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;
+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;
TAPI_VERIFY_MODE[sdk=iphone*] = Pedantic;
-
-DEFINES_MODULE = YES;
-CLANG_MODULES_ENABLE_VERIFIER_TOOL = YES;
-MODULEMAP_PRIVATE_FILE = $(MODULEMAP_PRIVATE_FILE_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-MODULEMAP_PRIVATE_FILE_COCOA_TOUCH_YES = $(SRCROOT)/Modules/WebKitLegacy_iOS.private.modulemap;
-MODULEMAP_PRIVATE_FILE_COCOA_TOUCH_NO = $(SRCROOT)/Modules/WebKitLegacy_macOS.private.modulemap;
Modified: trunk/Source/WebKitLegacy/mac/History/WebBackForwardListPrivate.h (283402 => 283403)
--- trunk/Source/WebKitLegacy/mac/History/WebBackForwardListPrivate.h 2021-10-01 21:24:36 UTC (rev 283402)
+++ trunk/Source/WebKitLegacy/mac/History/WebBackForwardListPrivate.h 2021-10-01 21:28:10 UTC (rev 283403)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005, 2021 Apple Inc. All rights reserved.
+ * Copyright (C) 2005 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -34,7 +34,7 @@
/*!
@method removeItem:
@abstract Removes an entry from the list.
- @param item The entry to remove. Cannot be the current item.
+ @param entry The entry to remove. Cannot be the current item.
*/
- (void)removeItem:(WebHistoryItem *)item;
Deleted: trunk/Source/WebKitLegacy/mac/Misc/WebKitLegacy_Private.h (283402 => 283403)
--- trunk/Source/WebKitLegacy/mac/Misc/WebKitLegacy_Private.h 2021-10-01 21:24:36 UTC (rev 283402)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebKitLegacy_Private.h 2021-10-01 21:28:10 UTC (rev 283403)
@@ -1,265 +0,0 @@
-/*
- * Copyright (C) 2021 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// Include in here only header files that are common to all platforms, and that
-// can be included from C and C++ source files. Files that should only be
-// included from C++ source files should be enumerated in the special "cpp"
-// section in WebKitLegacy_macOS.private.modulemap and/or
-// WebKitLegacy_iOS.private.modulemap.
-
-#import <WebKitLegacy/DOM.h>
-#import <WebKitLegacy/DOMAbstractView.h>
-#import <WebKitLegacy/DOMAttr.h>
-#import <WebKitLegacy/DOMBlob.h>
-#import <WebKitLegacy/DOMCDATASection.h>
-#import <WebKitLegacy/DOMCSS.h>
-#import <WebKitLegacy/DOMCSSCharsetRule.h>
-#import <WebKitLegacy/DOMCSSFontFaceRule.h>
-#import <WebKitLegacy/DOMCSSImportRule.h>
-#import <WebKitLegacy/DOMCSSMediaRule.h>
-#import <WebKitLegacy/DOMCSSPageRule.h>
-#import <WebKitLegacy/DOMCSSPrimitiveValue.h>
-#import <WebKitLegacy/DOMCSSRule.h>
-#import <WebKitLegacy/DOMCSSRuleList.h>
-#import <WebKitLegacy/DOMCSSStyleDeclaration.h>
-#import <WebKitLegacy/DOMCSSStyleRule.h>
-#import <WebKitLegacy/DOMCSSStyleSheet.h>
-#import <WebKitLegacy/DOMCSSUnknownRule.h>
-#import <WebKitLegacy/DOMCSSValue.h>
-#import <WebKitLegacy/DOMCSSValueList.h>
-#import <WebKitLegacy/DOMCharacterData.h>
-#import <WebKitLegacy/DOMComment.h>
-#import <WebKitLegacy/DOMCore.h>
-#import <WebKitLegacy/DOMCounter.h>
-#import <WebKitLegacy/DOMDocument.h>
-#import <WebKitLegacy/DOMDocumentFragment.h>
-#import <WebKitLegacy/DOMDocumentFragmentPrivate.h>
-#import <WebKitLegacy/DOMDocumentPrivate.h>
-#import <WebKitLegacy/DOMDocumentType.h>
-#import <WebKitLegacy/DOMElement.h>
-#import <WebKitLegacy/DOMEntity.h>
-#import <WebKitLegacy/DOMEntityReference.h>
-#import <WebKitLegacy/DOMEvent.h>
-#import <WebKitLegacy/DOMEventException.h>
-#import <WebKitLegacy/DOMEventListener.h>
-#import <WebKitLegacy/DOMEventTarget.h>
-#import <WebKitLegacy/DOMEvents.h>
-#import <WebKitLegacy/DOMException.h>
-#import <WebKitLegacy/DOMExtensions.h>
-#import <WebKitLegacy/DOMFile.h>
-#import <WebKitLegacy/DOMFileList.h>
-#import <WebKitLegacy/DOMHTML.h>
-#import <WebKitLegacy/DOMHTMLAnchorElement.h>
-#import <WebKitLegacy/DOMHTMLAppletElement.h>
-#import <WebKitLegacy/DOMHTMLAreaElement.h>
-#import <WebKitLegacy/DOMHTMLBRElement.h>
-#import <WebKitLegacy/DOMHTMLBaseElement.h>
-#import <WebKitLegacy/DOMHTMLBaseFontElement.h>
-#import <WebKitLegacy/DOMHTMLBodyElement.h>
-#import <WebKitLegacy/DOMHTMLButtonElement.h>
-#import <WebKitLegacy/DOMHTMLCanvasElement.h>
-#import <WebKitLegacy/DOMHTMLCollection.h>
-#import <WebKitLegacy/DOMHTMLDListElement.h>
-#import <WebKitLegacy/DOMHTMLDirectoryElement.h>
-#import <WebKitLegacy/DOMHTMLDivElement.h>
-#import <WebKitLegacy/DOMHTMLDocument.h>
-#import <WebKitLegacy/DOMHTMLElement.h>
-#import <WebKitLegacy/DOMHTMLElementPrivate.h>
-#import <WebKitLegacy/DOMHTMLEmbedElement.h>
-#import <WebKitLegacy/DOMHTMLFieldSetElement.h>
-#import <WebKitLegacy/DOMHTMLFontElement.h>
-#import <WebKitLegacy/DOMHTMLFormElement.h>
-#import <WebKitLegacy/DOMHTMLFrameElement.h>
-#import <WebKitLegacy/DOMHTMLFrameSetElement.h>
-#import <WebKitLegacy/DOMHTMLHRElement.h>
-#import <WebKitLegacy/DOMHTMLHeadElement.h>
-#import <WebKitLegacy/DOMHTMLHeadingElement.h>
-#import <WebKitLegacy/DOMHTMLHtmlElement.h>
-#import <WebKitLegacy/DOMHTMLIFrameElement.h>
-#import <WebKitLegacy/DOMHTMLImageElement.h>
-#import <WebKitLegacy/DOMHTMLInputElement.h>
-#import <WebKitLegacy/DOMHTMLInputElementPrivate.h>
-#import <WebKitLegacy/DOMHTMLLIElement.h>
-#import <WebKitLegacy/DOMHTMLLabelElement.h>
-#import <WebKitLegacy/DOMHTMLLegendElement.h>
-#import <WebKitLegacy/DOMHTMLLinkElement.h>
-#import <WebKitLegacy/DOMHTMLMapElement.h>
-#import <WebKitLegacy/DOMHTMLMarqueeElement.h>
-#import <WebKitLegacy/DOMHTMLMediaElement.h>
-#import <WebKitLegacy/DOMHTMLMenuElement.h>
-#import <WebKitLegacy/DOMHTMLMetaElement.h>
-#import <WebKitLegacy/DOMHTMLModElement.h>
-#import <WebKitLegacy/DOMHTMLOListElement.h>
-#import <WebKitLegacy/DOMHTMLObjectElement.h>
-#import <WebKitLegacy/DOMHTMLOptGroupElement.h>
-#import <WebKitLegacy/DOMHTMLOptionElement.h>
-#import <WebKitLegacy/DOMHTMLOptionsCollection.h>
-#import <WebKitLegacy/DOMHTMLParagraphElement.h>
-#import <WebKitLegacy/DOMHTMLParamElement.h>
-#import <WebKitLegacy/DOMHTMLPreElement.h>
-#import <WebKitLegacy/DOMHTMLQuoteElement.h>
-#import <WebKitLegacy/DOMHTMLScriptElement.h>
-#import <WebKitLegacy/DOMHTMLSelectElement.h>
-#import <WebKitLegacy/DOMHTMLStyleElement.h>
-#import <WebKitLegacy/DOMHTMLTableCaptionElement.h>
-#import <WebKitLegacy/DOMHTMLTableCellElement.h>
-#import <WebKitLegacy/DOMHTMLTableColElement.h>
-#import <WebKitLegacy/DOMHTMLTableElement.h>
-#import <WebKitLegacy/DOMHTMLTableRowElement.h>
-#import <WebKitLegacy/DOMHTMLTableSectionElement.h>
-#import <WebKitLegacy/DOMHTMLTextAreaElement.h>
-#import <WebKitLegacy/DOMHTMLTitleElement.h>
-#import <WebKitLegacy/DOMHTMLUListElement.h>
-#import <WebKitLegacy/DOMHTMLVideoElement.h>
-#import <WebKitLegacy/DOMImplementation.h>
-#import <WebKitLegacy/DOMKeyboardEvent.h>
-#import <WebKitLegacy/DOMMediaError.h>
-#import <WebKitLegacy/DOMMediaList.h>
-#import <WebKitLegacy/DOMMouseEvent.h>
-#import <WebKitLegacy/DOMMutationEvent.h>
-#import <WebKitLegacy/DOMNamedNodeMap.h>
-#import <WebKitLegacy/DOMNode.h>
-#import <WebKitLegacy/DOMNodeFilter.h>
-#import <WebKitLegacy/DOMNodeIterator.h>
-#import <WebKitLegacy/DOMNodeList.h>
-#import <WebKitLegacy/DOMNodePrivate.h>
-#import <WebKitLegacy/DOMObject.h>
-#import <WebKitLegacy/DOMOverflowEvent.h>
-#import <WebKitLegacy/DOMPrivate.h>
-#import <WebKitLegacy/DOMProcessingInstruction.h>
-#import <WebKitLegacy/DOMProgressEvent.h>
-#import <WebKitLegacy/DOMRGBColor.h>
-#import <WebKitLegacy/DOMRange.h>
-#import <WebKitLegacy/DOMRangeException.h>
-#import <WebKitLegacy/DOMRanges.h>
-#import <WebKitLegacy/DOMRect.h>
-#import <WebKitLegacy/DOMStyleSheet.h>
-#import <WebKitLegacy/DOMStyleSheetList.h>
-#import <WebKitLegacy/DOMStylesheets.h>
-#import <WebKitLegacy/DOMText.h>
-#import <WebKitLegacy/DOMTextEvent.h>
-#import <WebKitLegacy/DOMTimeRanges.h>
-#import <WebKitLegacy/DOMTraversal.h>
-#import <WebKitLegacy/DOMTreeWalker.h>
-#import <WebKitLegacy/DOMUIEvent.h>
-#import <WebKitLegacy/DOMViews.h>
-#import <WebKitLegacy/DOMWheelEvent.h>
-#import <WebKitLegacy/DOMXPath.h>
-#import <WebKitLegacy/DOMXPathException.h>
-#import <WebKitLegacy/DOMXPathExpression.h>
-#import <WebKitLegacy/DOMXPathNSResolver.h>
-#import <WebKitLegacy/DOMXPathResult.h>
-// #import <WebKitLegacy/NSURLDownloadSPI.h> // Skipped in favor of NSURLDownload in Apple Internal SDK headers.
-#import <WebKitLegacy/WebAllowDenyPolicyListener.h>
-#import <WebKitLegacy/WebApplicationCache.h>
-#import <WebKitLegacy/WebArchive.h>
-#import <WebKitLegacy/WebAutocapitalizeTypes.h>
-#import <WebKitLegacy/WebBackForwardList.h>
-#import <WebKitLegacy/WebBackForwardListPrivate.h>
-#import <WebKitLegacy/WebCache.h>
-#import <WebKitLegacy/WebCoreStatistics.h>
-// #import <WebKitLegacy/WebCreateFragmentInternal.h> // Handled in modulemap file due to requirement that it only be included from C++ source files.
-#import <WebKitLegacy/WebDOMOperations.h>
-#import <WebKitLegacy/WebDOMOperationsPrivate.h>
-#import <WebKitLegacy/WebDataSource.h>
-#import <WebKitLegacy/WebDataSourcePrivate.h>
-#import <WebKitLegacy/WebDatabaseManagerPrivate.h>
-#import <WebKitLegacy/WebDatabaseQuotaManager.h>
-#import <WebKitLegacy/WebDefaultPolicyDelegate.h>
-#import <WebKitLegacy/WebDeviceOrientation.h>
-#import <WebKitLegacy/WebDeviceOrientationProvider.h>
-#import <WebKitLegacy/WebDeviceOrientationProviderMock.h>
-#import <WebKitLegacy/WebDocument.h>
-#import <WebKitLegacy/WebDocumentPrivate.h>
-#import <WebKitLegacy/WebDownload.h>
-#import <WebKitLegacy/WebEditingDelegate.h>
-#import <WebKitLegacy/WebEditingDelegatePrivate.h>
-#import <WebKitLegacy/WebFeature.h>
-#import <WebKitLegacy/WebFormDelegate.h>
-#import <WebKitLegacy/WebFormDelegatePrivate.h>
-#import <WebKitLegacy/WebFrame.h>
-#import <WebKitLegacy/WebFrameLoadDelegate.h>
-#import <WebKitLegacy/WebFrameLoadDelegatePrivate.h>
-#import <WebKitLegacy/WebFramePrivate.h>
-#import <WebKitLegacy/WebFrameView.h>
-#import <WebKitLegacy/WebFrameViewPrivate.h>
-#import <WebKitLegacy/WebGeolocationPosition.h>
-#import <WebKitLegacy/WebHTMLRepresentation.h>
-#import <WebKitLegacy/WebHTMLRepresentationPrivate.h>
-#import <WebKitLegacy/WebHTMLView.h>
-#import <WebKitLegacy/WebHTMLViewPrivate.h>
-#import <WebKitLegacy/WebHistory.h>
-#import <WebKitLegacy/WebHistoryItem.h>
-#import <WebKitLegacy/WebHistoryItemPrivate.h>
-#import <WebKitLegacy/WebHistoryPrivate.h>
-#import <WebKitLegacy/WebInspector.h>
-#import <WebKitLegacy/WebInspectorPrivate.h>
-#import <WebKitLegacy/WebKit.h>
-#import <WebKitLegacy/WebKitAvailability.h>
-#import <WebKitLegacy/WebKitErrors.h>
-#import <WebKitLegacy/WebKitErrorsPrivate.h>
-#import <WebKitLegacy/WebKitNSStringExtras.h>
-#import <WebKitLegacy/WebKitPluginHostTypes.h>
-#import <WebKitLegacy/WebKitStatistics.h>
-#import <WebKitLegacy/WebLocalizableStrings.h>
-#import <WebKitLegacy/WebNSDataExtrasPrivate.h>
-#import <WebKitLegacy/WebNSFileManagerExtras.h>
-#import <WebKitLegacy/WebNSURLExtras.h>
-#import <WebKitLegacy/WebNSUserDefaultsExtras.h>
-#import <WebKitLegacy/WebNSViewExtras.h>
-#import <WebKitLegacy/WebNavigationData.h>
-#import <WebKitLegacy/WebNotification.h>
-#import <WebKitLegacy/WebPlugin.h>
-#import <WebKitLegacy/WebPluginContainer.h>
-#import <WebKitLegacy/WebPluginContainerPrivate.h>
-#import <WebKitLegacy/WebPluginDatabase.h>
-#import <WebKitLegacy/WebPluginPackagePrivate.h>
-#import <WebKitLegacy/WebPluginViewFactory.h>
-#import <WebKitLegacy/WebPluginViewFactoryPrivate.h>
-#import <WebKitLegacy/WebPolicyDelegate.h>
-#import <WebKitLegacy/WebPolicyDelegatePrivate.h>
-#import <WebKitLegacy/WebPreferenceKeysPrivate.h>
-#import <WebKitLegacy/WebPreferences.h>
-#import <WebKitLegacy/WebPreferencesPrivate.h>
-#import <WebKitLegacy/WebQuotaManager.h>
-#import <WebKitLegacy/WebResource.h>
-#import <WebKitLegacy/WebResourceLoadDelegate.h>
-#import <WebKitLegacy/WebResourceLoadDelegatePrivate.h>
-#import <WebKitLegacy/WebResourcePrivate.h>
-#import <WebKitLegacy/WebScriptDebugDelegate.h>
-#import <WebKitLegacy/WebScriptObject.h>
-#import <WebKitLegacy/WebScriptWorld.h>
-#import <WebKitLegacy/WebSecurityOriginPrivate.h>
-#import <WebKitLegacy/WebStorageManagerPrivate.h>
-#import <WebKitLegacy/WebTextIterator.h>
-#import <WebKitLegacy/WebUIDelegate.h>
-#import <WebKitLegacy/WebUIDelegatePrivate.h>
-#import <WebKitLegacy/WebURLsWithTitles.h>
-#import <WebKitLegacy/WebUserContentURLPattern.h>
-#import <WebKitLegacy/WebView.h>
-#import <WebKitLegacy/WebViewPrivate.h>
Deleted: trunk/Source/WebKitLegacy/mac/Misc/WebKitLegacy_iOS_Private.h (283402 => 283403)
--- trunk/Source/WebKitLegacy/mac/Misc/WebKitLegacy_iOS_Private.h 2021-10-01 21:24:36 UTC (rev 283402)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebKitLegacy_iOS_Private.h 2021-10-01 21:28:10 UTC (rev 283403)
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2021 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <WebKitLegacy/WebKitLegacy_Private.h>
-
-// Include below only header files for non-macOS platforms, and that can be
-// included from both C and C++ source files. macOS header files should be
-// enumerated in WebKitLegacy_macOS_Private.h. Files that should only be
-// included from C++ source files should be enumerated in the special "cpp"
-// section in WebKitLegacy_iOS.private.modulemap.
-
-#import <WebKitLegacy/AbstractPasteboard.h>
-#import <WebKitLegacy/DOMHTMLTextAreaElementPrivate.h>
-#import <WebKitLegacy/DOMUIKitExtensions.h>
-#import <WebKitLegacy/KeyEventCodesIOS.h>
-#import <WebKitLegacy/WAKAppKitStubs.h>
-#import <WebKitLegacy/WAKResponder.h>
-#import <WebKitLegacy/WAKView.h>
-#import <WebKitLegacy/WAKWindow.h>
-#import <WebKitLegacy/WKContentObservation.h>
-#import <WebKitLegacy/WKGraphics.h>
-#import <WebKitLegacy/WKTypes.h>
-#import <WebKitLegacy/WebCaretChangeListener.h>
-#import <WebKitLegacy/WebCoreThread.h>
-#import <WebKitLegacy/WebCoreThreadMessage.h>
-#import <WebKitLegacy/WebCoreThreadRun.h>
-#import <WebKitLegacy/WebEvent.h>
-#import <WebKitLegacy/WebEventRegion.h>
-#import <WebKitLegacy/WebFixedPositionContent.h>
-#import <WebKitLegacy/WebFrameIOS.h>
-#import <WebKitLegacy/WebFrameIPhone.h>
-// #import <WebKitLegacy/WebGeolocationCoreLocationProvider.h> // Handled in modulemap file due to requirement that it only be included from C++ source files.
-#import <WebKitLegacy/WebGeolocationPrivate.h>
-#import <WebKitLegacy/WebGeolocationProviderIOS.h>
-#import <WebKitLegacy/WebItemProviderPasteboard.h>
-#import <WebKitLegacy/WebMIMETypeRegistry.h>
-#import <WebKitLegacy/WebNSStringExtrasIOS.h>
-#import <WebKitLegacy/WebNSStringExtrasIPhone.h>
-#import <WebKitLegacy/WebPDFViewIOS.h>
-#import <WebKitLegacy/WebPDFViewIPhone.h>
-#import <WebKitLegacy/WebPDFViewPlaceholder.h>
-#import <WebKitLegacy/WebSelectionRect.h>
-#import <WebKitLegacy/WebUIKitDelegate.h>
-#import <WebKitLegacy/WebUIKitSupport.h>
-#import <WebKitLegacy/WebVisiblePosition.h>
Deleted: trunk/Source/WebKitLegacy/mac/Misc/WebKitLegacy_macOS_Private.h (283402 => 283403)
--- trunk/Source/WebKitLegacy/mac/Misc/WebKitLegacy_macOS_Private.h 2021-10-01 21:24:36 UTC (rev 283402)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebKitLegacy_macOS_Private.h 2021-10-01 21:28:10 UTC (rev 283403)
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2021 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <WebKitLegacy/WebKitLegacy_Private.h>
-
-// Include below only header files for macOS, and that can be included from
-// both C and C++ source files. Non-macOS header files should be enumerated in
-// WebKitLegacy_iOS_Private.h. Files that should only be included from C++
-// source files should be enumerated in the special "cpp" section in
-// WebKitLegacy_macOS.private.modulemap.
-
-#import <WebKitLegacy/WebDashboardRegion.h>
-#import <WebKitLegacy/WebDynamicScrollBarsView.h>
-#import <WebKitLegacy/WebIconDatabase.h>
-#import <WebKitLegacy/WebJavaScriptTextInputPanel.h>
-#import <WebKitLegacy/WebNSEventExtras.h>
-#import <WebKitLegacy/WebNSPasteboardExtras.h>
-#import <WebKitLegacy/WebNSWindowExtras.h>
-#import <WebKitLegacy/WebPanelAuthenticationHandler.h>
-#import <WebKitLegacy/WebStringTruncator.h>
-#import <WebKitLegacy/npapi.h>
-#import <WebKitLegacy/npfunctions.h>
-#import <WebKitLegacy/npruntime.h>
-#import <WebKitLegacy/nptypes.h>
