Title: [284728] trunk/Source
Revision
284728
Author
[email protected]
Date
2021-10-22 16:51:51 -0700 (Fri, 22 Oct 2021)

Log Message

Unreviewed, reverting r284713.
https://bugs.webkit.org/show_bug.cgi?id=232187

Broke some Apple internal builds

Reverted changeset:

"Add a module map file for PrivateFrameworks/WebKitLegacy"
https://bugs.webkit.org/show_bug.cgi?id=230735
https://commits.webkit.org/r284713

Modified Paths

Removed Paths

  • trunk/Source/WebKitLegacy/Modules/

Diff

Modified: trunk/Source/WebCore/ChangeLog (284727 => 284728)


--- trunk/Source/WebCore/ChangeLog	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebCore/ChangeLog	2021-10-22 23:51:51 UTC (rev 284728)
@@ -1,3 +1,16 @@
+2021-10-22  Commit Queue  <[email protected]>
+
+        Unreviewed, reverting r284713.
+        https://bugs.webkit.org/show_bug.cgi?id=232187
+
+        Broke some Apple internal builds
+
+        Reverted changeset:
+
+        "Add a module map file for PrivateFrameworks/WebKitLegacy"
+        https://bugs.webkit.org/show_bug.cgi?id=230735
+        https://commits.webkit.org/r284713
+
 2021-10-22  Joonghun Park  <[email protected]>
 
         Integer interpolation in animations should be rounded towards positive infinity, not away from zero.

Modified: trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h (284727 => 284728)


--- trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -23,8 +23,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <CoreGraphics/CoreGraphics.h>
-
 #if TARGET_OS_IPHONE
 #import <WebCore/AbstractPasteboard.h>
 #endif
@@ -31,6 +29,8 @@
 
 #if TARGET_OS_IOS
 
+struct CGSize;
+
 typedef NS_ENUM(NSInteger, WebPreferredPresentationStyle) {
     WebPreferredPresentationStyleUnspecified,
     WebPreferredPresentationStyleInline,

Modified: trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h (284727 => 284728)


--- trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -26,11 +26,10 @@
 #ifndef WAKAppKitStubs_h
 #define WAKAppKitStubs_h
 
-#import <Foundation/Foundation.h>
-
 #if TARGET_OS_IPHONE
 
 #import <CoreGraphics/CoreGraphics.h>
+#import <Foundation/Foundation.h>
 
 #ifndef NSClipView
 #define NSClipView WAKClipView

Modified: trunk/Source/WebCore/platform/ios/wak/WAKResponder.h (284727 => 284728)


--- trunk/Source/WebCore/platform/ios/wak/WAKResponder.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebCore/platform/ios/wak/WAKResponder.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -26,11 +26,10 @@
 #ifndef WAKResponder_h
 #define WAKResponder_h
 
-#import <Foundation/Foundation.h>
-
 #if TARGET_OS_IPHONE
 
-#import <WebCore/WKTypes.h>
+#import "WKTypes.h"
+#import <Foundation/Foundation.h>
 
 @class WebEvent;
 

Modified: trunk/Source/WebCore/platform/ios/wak/WAKView.h (284727 => 284728)


--- trunk/Source/WebCore/platform/ios/wak/WAKView.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebCore/platform/ios/wak/WAKView.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -26,13 +26,12 @@
 #ifndef WAKView_h
 #define WAKView_h
 
-#import <Foundation/Foundation.h>
-
 #if TARGET_OS_IPHONE
 
+#import "WAKAppKitStubs.h"
+#import "WAKResponder.h"
+#import <Foundation/Foundation.h>
 #import <CoreGraphics/CoreGraphics.h>
-#import <WebCore/WAKAppKitStubs.h>
-#import <WebCore/WAKResponder.h>
 
 extern NSString *WAKViewFrameSizeDidChangeNotification;
 extern NSString *WAKViewDidScrollNotification;

Modified: trunk/Source/WebCore/platform/ios/wak/WAKWindow.h (284727 => 284728)


--- trunk/Source/WebCore/platform/ios/wak/WAKWindow.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebCore/platform/ios/wak/WAKWindow.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -25,14 +25,13 @@
 
 #pragma once
 
-#import <Foundation/Foundation.h>
-
 #if TARGET_OS_IPHONE
 
+#import "WAKAppKitStubs.h"
+#import "WAKView.h"
+#import "WKContentObservation.h"
 #import <CoreGraphics/CoreGraphics.h>
-#import <WebCore/WAKAppKitStubs.h>
-#import <WebCore/WAKView.h>
-#import <WebCore/WKContentObservation.h>
+#import <Foundation/Foundation.h>
 
 @class CALayer;
 @class WebEvent;

Modified: trunk/Source/WebCore/platform/ios/wak/WKContentObservation.h (284727 => 284728)


--- trunk/Source/WebCore/platform/ios/wak/WKContentObservation.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebCore/platform/ios/wak/WKContentObservation.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -26,8 +26,6 @@
 #ifndef WKContentObservation_h
 #define WKContentObservation_h
 
-#include <TargetConditionals.h>
-
 #if TARGET_OS_IPHONE
 
 #ifdef __cplusplus

Modified: trunk/Source/WebCore/platform/ios/wak/WebCoreThreadMessage.h (284727 => 284728)


--- trunk/Source/WebCore/platform/ios/wak/WebCoreThreadMessage.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebCore/platform/ios/wak/WebCoreThreadMessage.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -31,7 +31,7 @@
 #import <Foundation/Foundation.h>
 
 #ifdef __OBJC__
-#import <WebCore/WebCoreThread.h>
+#import "WebCoreThread.h"
 #endif // __OBJC__
 
 #if defined(__cplusplus)

Modified: trunk/Source/WebKitLegacy/ChangeLog (284727 => 284728)


--- trunk/Source/WebKitLegacy/ChangeLog	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/ChangeLog	2021-10-22 23:51:51 UTC (rev 284728)
@@ -1,3 +1,16 @@
+2021-10-22  Commit Queue  <[email protected]>
+
+        Unreviewed, reverting r284713.
+        https://bugs.webkit.org/show_bug.cgi?id=232187
+
+        Broke some Apple internal builds
+
+        Reverted changeset:
+
+        "Add a module map file for PrivateFrameworks/WebKitLegacy"
+        https://bugs.webkit.org/show_bug.cgi?id=230735
+        https://commits.webkit.org/r284713
+
 2021-10-22  Ian Anderson  <[email protected]>
 
         Add a module map file for PrivateFrameworks/WebKitLegacy

Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (284727 => 284728)


--- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj	2021-10-22 23:51:51 UTC (rev 284728)
@@ -1036,8 +1036,6 @@
 		848DFF860365FE6A00CA2ACA /* WebPluginViewFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginViewFactory.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
 		84AE905F062DE6A80075BBF9 /* WebDOMOperationsPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDOMOperationsPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
 		84CA5F7E042685E800CA2ACA /* WebKitErrorsPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKitErrorsPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-		84E2901126FC3D99005139F2 /* WebKitLegacy.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = WebKitLegacy.modulemap; sourceTree = "<group>"; };
-		84E2901226FC3DA4005139F2 /* WebKitLegacy.private.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = WebKitLegacy.private.modulemap; sourceTree = "<group>"; };
 		930D02BB06275F640076701E /* WebViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebViewInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
 		930D02BD06275F710076701E /* WebFrameInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
 		93154EF103A41270008635CE /* WebPanelAuthenticationHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPanelAuthenticationHandler.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -1646,7 +1644,6 @@
 				1C68F63F095B5F9C00C2984E /* WebInspector */,
 				089C1665FE841158C02AAC07 /* Resources */,
 				7C02320E251B8E3A00BA7BB6 /* Scripts */,
-				534F75362578AAE8005BE7D8 /* Modules */,
 				0867D69AFE84028FC02AAC07 /* Frameworks and Libraries */,
 				034768DFFF38A50411DB9C8B /* Products */,
 				1C904FCE0BA9DCF20081E9D0 /* Configurations */,
@@ -1923,15 +1920,6 @@
 			name = PDF;
 			sourceTree = "<group>";
 		};
-		534F75362578AAE8005BE7D8 /* Modules */ = {
-			isa = PBXGroup;
-			children = (
-				84E2901126FC3D99005139F2 /* WebKitLegacy.modulemap */,
-				84E2901226FC3DA4005139F2 /* WebKitLegacy.private.modulemap */,
-			);
-			path = Modules;
-			sourceTree = "<group>";
-		};
 		6508A4A7099B375F00BCBF45 /* Default Delegates */ = {
 			isa = PBXGroup;
 			children = (

Modified: trunk/Source/WebKitLegacy/ios/ChangeLog (284727 => 284728)


--- trunk/Source/WebKitLegacy/ios/ChangeLog	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/ios/ChangeLog	2021-10-22 23:51:51 UTC (rev 284728)
@@ -1,3 +1,16 @@
+2021-10-22  Commit Queue  <[email protected]>
+
+        Unreviewed, reverting r284713.
+        https://bugs.webkit.org/show_bug.cgi?id=232187
+
+        Broke some Apple internal builds
+
+        Reverted changeset:
+
+        "Add a module map file for PrivateFrameworks/WebKitLegacy"
+        https://bugs.webkit.org/show_bug.cgi?id=230735
+        https://commits.webkit.org/r284713
+
 2021-10-22  Ian Anderson  <[email protected]>
 
         Add a module map file for PrivateFrameworks/WebKitLegacy

Modified: trunk/Source/WebKitLegacy/ios/Misc/WebGeolocationCoreLocationProvider.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/ios/Misc/WebGeolocationCoreLocationProvider.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/ios/Misc/WebGeolocationCoreLocationProvider.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -23,9 +23,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(__cplusplus)
+#import <Foundation/NSObject.h>
 
-#import <Foundation/Foundation.h>
+@class CLLocationManager;
+@class NSString;
 
 namespace WebCore {
 class GeolocationPositionData;
@@ -58,5 +59,3 @@
 
 - (void)setEnableHighAccuracy:(BOOL)flag;
 @end
-
-#endif

Modified: trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebFixedPositionContent.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebFixedPositionContent.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebFixedPositionContent.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -23,7 +23,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <CoreGraphics/CoreGraphics.h>
 #import <Foundation/Foundation.h>
 
 @class CALayer;

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2021-10-22 23:51:51 UTC (rev 284728)
@@ -1,3 +1,16 @@
+2021-10-22  Commit Queue  <[email protected]>
+
+        Unreviewed, reverting r284713.
+        https://bugs.webkit.org/show_bug.cgi?id=232187
+
+        Broke some Apple internal builds
+
+        Reverted changeset:
+
+        "Add a module map file for PrivateFrameworks/WebKitLegacy"
+        https://bugs.webkit.org/show_bug.cgi?id=230735
+        https://commits.webkit.org/r284713
+
 2021-10-22  Ian Anderson  <[email protected]>
 
         Add a module map file for PrivateFrameworks/WebKitLegacy

Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	2021-10-22 23:51:51 UTC (rev 284728)
@@ -156,15 +156,3 @@
 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)/NSURLDownloadSPI.h -extra-private-header $(SOURCE_ROOT)/mac/TestingFunctions.h;
 TAPI_VERIFY_MODE[sdk=iphone*] = Pedantic;
-
-DEFINES_MODULE = $(DEFINES_MODULE_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-DEFINES_MODULE_COCOA_TOUCH_YES = YES;
-
-CLANG_MODULES_ENABLE_VERIFIER_TOOL = $(CLANG_MODULES_ENABLE_VERIFIER_TOOL_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH)_$(USE_INTERNAL_SDK));
-CLANG_MODULES_ENABLE_VERIFIER_TOOL_COCOA_TOUCH_YES_YES = YES;
-
-MODULEMAP_FILE = $(MODULEMAP_FILE_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-MODULEMAP_FILE_COCOA_TOUCH_YES = $(SRCROOT)/Modules/WebKitLegacy.modulemap;
-
-MODULEMAP_PRIVATE_FILE = $(MODULEMAP_PRIVATE_FILE_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-MODULEMAP_PRIVATE_FILE_COCOA_TOUCH_YES = $(SRCROOT)/Modules/WebKitLegacy.private.modulemap;

Modified: trunk/Source/WebKitLegacy/mac/DOM/DOMEventListener.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/DOM/DOMEventListener.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/DOM/DOMEventListener.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -24,7 +24,6 @@
  */
 
 #import <WebKitLegacy/WebKitAvailability.h>
-#import <objc/NSObject.h>
 
 @class DOMEvent;
 

Modified: trunk/Source/WebKitLegacy/mac/DOM/DOMEventTarget.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/DOM/DOMEventTarget.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/DOM/DOMEventTarget.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -23,7 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <Foundation/Foundation.h>
 #import <WebKitLegacy/WebKitAvailability.h>
 
 @class DOMEvent;

Modified: trunk/Source/WebKitLegacy/mac/DOM/DOMNodeFilter.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/DOM/DOMNodeFilter.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/DOM/DOMNodeFilter.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -24,7 +24,6 @@
  */
 
 #import <WebKitLegacy/WebKitAvailability.h>
-#import <objc/NSObject.h>
 
 @class DOMNode;
 

Modified: trunk/Source/WebKitLegacy/mac/DOM/DOMXPathNSResolver.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/DOM/DOMXPathNSResolver.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/DOM/DOMXPathNSResolver.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -24,7 +24,6 @@
  */
 
 #import <WebKitLegacy/WebKitAvailability.h>
-#import <objc/NSObject.h>
 
 @class NSString;
 

Modified: trunk/Source/WebKitLegacy/mac/DOM/WebDOMOperationsPrivate.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/DOM/WebDOMOperationsPrivate.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/DOM/WebDOMOperationsPrivate.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <Foundation/Foundation.h>
 #import <WebKitLegacy/WebDOMOperations.h>
 #import <_javascript_Core/JSBase.h>
 

Modified: trunk/Source/WebKitLegacy/mac/History/WebHistoryItemPrivate.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/History/WebHistoryItemPrivate.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/History/WebHistoryItemPrivate.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <CoreGraphics/CoreGraphics.h>
 #import <WebKitLegacy/WebHistoryItem.h>
 
 #if TARGET_OS_IPHONE

Modified: trunk/Source/WebKitLegacy/mac/Misc/NSURLDownloadSPI.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/Misc/NSURLDownloadSPI.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/Misc/NSURLDownloadSPI.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -23,18 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <Foundation/Foundation.h>
-#import <WebKitLegacy/WebKitAvailability.h>
-
-#if defined(TARGET_OS_MACCATALYST) && TARGET_OS_MACCATALYST
-#import <CFNetwork/CFNSURLConnection.h>
-#elif !TARGET_OS_IPHONE || (defined(USE_APPLE_INTERNAL_SDK) && USE_APPLE_INTERNAL_SDK)
-#import <Foundation/NSURLDownload.h>
-#else
-
 @interface NSURLDownload : NSObject
 @end
 
 @protocol NSURLDownloadDelegate;
-
-#endif

Modified: trunk/Source/WebKitLegacy/mac/Misc/WebCache.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/Misc/WebCache.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebCache.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -23,9 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#import <CoreGraphics/CoreGraphics.h>
-#import <Foundation/Foundation.h>
-
 #if TARGET_OS_IPHONE
 @class WebFrame;
 #endif

Modified: trunk/Source/WebKitLegacy/mac/Misc/WebDownload.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/Misc/WebDownload.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebDownload.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -26,15 +26,15 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#import <Foundation/Foundation.h>
+#import <WebKitLegacy/WebKitAvailability.h>
+
 #ifndef WebDownload_h
 #define WebDownload_h
 
-#import <Foundation/Foundation.h>
-#import <WebKitLegacy/WebKitAvailability.h>
-
-#if defined(TARGET_OS_MACCATALYST) && TARGET_OS_MACCATALYST
+#if (defined TARGET_OS_MACCATALYST && TARGET_OS_MACCATALYST)
 #import <CFNetwork/CFNSURLConnection.h>
-#elif !TARGET_OS_IPHONE || (defined(USE_APPLE_INTERNAL_SDK) && USE_APPLE_INTERNAL_SDK)
+#elif !TARGET_OS_IPHONE || (defined USE_APPLE_INTERNAL_SDK && USE_APPLE_INTERNAL_SDK)
 #import <Foundation/NSURLDownload.h>
 #else
 #import <WebKitLegacy/NSURLDownloadSPI.h>

Modified: trunk/Source/WebKitLegacy/mac/Misc/WebKitErrorsPrivate.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/Misc/WebKitErrorsPrivate.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebKitErrorsPrivate.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <Foundation/Foundation.h>
 #import <WebKitLegacy/WebKitErrors.h>
 
 #define WebKitErrorPlugInCancelledConnection 203

Modified: trunk/Source/WebKitLegacy/mac/Misc/WebLocalizableStrings.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/Misc/WebLocalizableStrings.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebLocalizableStrings.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -29,7 +29,7 @@
 #pragma once
 
 #ifdef __OBJC__
-#import <Foundation/Foundation.h>
+@class NSBundle;
 typedef NSString *WebLocalizedStringType;
 #else
 #ifdef __cplusplus

Modified: trunk/Source/WebKitLegacy/mac/Misc/WebUserContentURLPattern.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/Misc/WebUserContentURLPattern.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebUserContentURLPattern.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -22,8 +22,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <Foundation/Foundation.h>
-
 @class WebUserContentURLPatternPrivate;
 
 @interface WebUserContentURLPattern : NSObject {

Modified: trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebKitPluginHostTypes.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebKitPluginHostTypes.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebKitPluginHostTypes.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -26,8 +26,6 @@
 #ifndef WebKitPluginHostTypes_h
 #define WebKitPluginHostTypes_h
 
-#include <stdint.h>
-
 typedef uint8_t* plist_bytes_t;
 typedef uint8_t* application_name_t;
 

Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebPlugin.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/Plugins/WebPlugin.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebPlugin.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <CoreGraphics/CoreGraphics.h>
 #import <Foundation/Foundation.h>
 #import <WebKitLegacy/WebKitAvailability.h>
 

Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebPluginContainer.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/Plugins/WebPluginContainer.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebPluginContainer.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -30,10 +30,9 @@
 
 #if !TARGET_OS_IPHONE
 #import <AppKit/AppKit.h>
+@class WebFrame;
 #endif
 
-@class WebFrame;
-
 /*!
     This informal protocol enables a plug-in to request that its containing application
     perform certain operations.

Modified: trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseManagerPrivate.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseManagerPrivate.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseManagerPrivate.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -26,8 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <Foundation/Foundation.h>
-
 extern NSString *WebDatabaseDirectoryDefaultsKey;
 
 extern NSString *WebDatabaseDisplayNameKey;

Modified: trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseQuotaManager.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseQuotaManager.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseQuotaManager.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKitLegacy/WebQuotaManager.h>
-#import <objc/NSObject.h>
+#import "WebQuotaManager.h"
 
 @interface WebDatabaseQuotaManager : NSObject <WebQuotaManager> {
 @private

Modified: trunk/Source/WebKitLegacy/mac/Storage/WebStorageManagerPrivate.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/Storage/WebStorageManagerPrivate.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/Storage/WebStorageManagerPrivate.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -23,8 +23,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <Foundation/Foundation.h>
-
 extern NSString * const WebStorageDirectoryDefaultsKey;
 extern NSString * const WebStorageDidModifyOriginNotification;
 

Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebCreateFragmentInternal.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebCreateFragmentInternal.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebCreateFragmentInternal.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -25,10 +25,6 @@
 
 #pragma once
 
-#if defined(__cplusplus)
-
-#import <Foundation/Foundation.h>
-
 namespace WebCore {
 class Document;
 struct FragmentAndResources;
@@ -35,5 +31,3 @@
 }
 
 extern "C" void _WebCreateFragment(WebCore::Document&, NSAttributedString *, WebCore::FragmentAndResources&);
-
-#endif

Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSecurityOriginPrivate.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSecurityOriginPrivate.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSecurityOriginPrivate.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -26,8 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <Foundation/Foundation.h>
-
 struct WebSecurityOriginPrivate;
 
 @protocol WebQuotaManager;

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientation.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientation.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientation.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -23,8 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <objc/NSObject.h>
-#import <stdbool.h>
 
 @class WebDeviceOrientationInternal;
 

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProvider.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProvider.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProvider.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -23,8 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <objc/NSObject.h>
-
 @class WebDeviceOrientation;
 
 @protocol WebDeviceOrientationProvider <NSObject>

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProviderMock.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProviderMock.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProviderMock.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -23,8 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKitLegacy/WebDeviceOrientationProvider.h>
-#import <objc/NSObject.h>
+#import "WebDeviceOrientationProvider.h"
 
 @class WebDeviceOrientationProviderMockInternal;
 @class WebDeviceOrientation;

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebEditingDelegatePrivate.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/WebView/WebEditingDelegatePrivate.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebEditingDelegatePrivate.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -28,9 +28,6 @@
 
 #import <WebKitLegacy/WebEditingDelegate.h>
 
-#if TARGET_OS_IPHONE
-@class DOMDocumentFragment;
-#endif
 @class DOMHTMLElement;
 
 @interface NSObject (WebViewEditingDelegatePrivate)

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebFormDelegatePrivate.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/WebView/WebFormDelegatePrivate.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebFormDelegatePrivate.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKitLegacy/WebFormDelegate.h>
+#import "WebFormDelegate.h"
 
 @interface WebFormDelegate (WebPrivate)
 + (WebFormDelegate *)_sharedWebFormDelegate;

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebGeolocationPosition.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/WebView/WebGeolocationPosition.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebGeolocationPosition.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -23,8 +23,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <objc/NSObject.h>
-
 @class WebGeolocationPositionInternal;
 
 @interface WebGeolocationPosition : NSObject

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebResourceLoadDelegatePrivate.h (284727 => 284728)


--- trunk/Source/WebKitLegacy/mac/WebView/WebResourceLoadDelegatePrivate.h	2021-10-22 23:50:13 UTC (rev 284727)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebResourceLoadDelegatePrivate.h	2021-10-22 23:51:51 UTC (rev 284728)
@@ -26,11 +26,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <Foundation/Foundation.h>
 #import <TargetConditionals.h>
 
 @class WebView;
 @class WebDataSource;
+@class NSURLAuthenticationChallenge;
+@class NSURLResponse;
+@class NSURLRequest;
 
 @interface NSObject (WebResourceLoadDelegatePrivate)
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to