⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 284728 in webkit


Ignore:
Timestamp:
Oct 22, 2021, 4:51:51 PM (5 years ago)
Author:
commit-queue@webkit.org
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

Location:
trunk/Source
Files:
1 deleted
42 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r284725 r284728  
     12021-10-22  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r284713.
     4        https://bugs.webkit.org/show_bug.cgi?id=232187
     5
     6        Broke some Apple internal builds
     7
     8        Reverted changeset:
     9
     10        "Add a module map file for PrivateFrameworks/WebKitLegacy"
     11        https://bugs.webkit.org/show_bug.cgi?id=230735
     12        https://commits.webkit.org/r284713
     13
    1142021-10-22  Joonghun Park  <pjh0718@gmail.com>
    215

  • trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h

    r284713 r284728  
    2424 */
    2525
    26 #import <CoreGraphics/CoreGraphics.h>
    27 
    2826#if TARGET_OS_IPHONE
    2927#import <WebCore/AbstractPasteboard.h>
    … …  
    3129
    3230#if TARGET_OS_IOS
     31
     32struct CGSize;
    3333
    3434typedef NS_ENUM(NSInteger, WebPreferredPresentationStyle) {

  • trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h

    r284713 r284728  
    2727#define WAKAppKitStubs_h
    2828
     29#if TARGET_OS_IPHONE
     30
     31#import <CoreGraphics/CoreGraphics.h>
    2932#import <Foundation/Foundation.h>
    30 
    31 #if TARGET_OS_IPHONE
    32 
    33 #import <CoreGraphics/CoreGraphics.h>
    3433
    3534#ifndef NSClipView

  • trunk/Source/WebCore/platform/ios/wak/WAKResponder.h

    r284713 r284728  
    2727#define WAKResponder_h
    2828
    29 #import <Foundation/Foundation.h>
    30 
    3129#if TARGET_OS_IPHONE
    3230
    33 #import <WebCore/WKTypes.h>
     31#import "WKTypes.h"
     32#import <Foundation/Foundation.h>
    3433
    3534@class WebEvent;

  • trunk/Source/WebCore/platform/ios/wak/WAKView.h

    r284713 r284728  
    2727#define WAKView_h
    2828
    29 #import <Foundation/Foundation.h>
    30 
    3129#if TARGET_OS_IPHONE
    3230
     31#import "WAKAppKitStubs.h"
     32#import "WAKResponder.h"
     33#import <Foundation/Foundation.h>
    3334#import <CoreGraphics/CoreGraphics.h>
    34 #import <WebCore/WAKAppKitStubs.h>
    35 #import <WebCore/WAKResponder.h>
    3635
    3736extern NSString *WAKViewFrameSizeDidChangeNotification;

  • trunk/Source/WebCore/platform/ios/wak/WAKWindow.h

    r284713 r284728  
    2626#pragma once
    2727
    28 #import <Foundation/Foundation.h>
    29 
    3028#if TARGET_OS_IPHONE
    3129
     30#import "WAKAppKitStubs.h"
     31#import "WAKView.h"
     32#import "WKContentObservation.h"
    3233#import <CoreGraphics/CoreGraphics.h>
    33 #import <WebCore/WAKAppKitStubs.h>
    34 #import <WebCore/WAKView.h>
    35 #import <WebCore/WKContentObservation.h>
     34#import <Foundation/Foundation.h>
    3635
    3736@class CALayer;

  • trunk/Source/WebCore/platform/ios/wak/WKContentObservation.h

    r284713 r284728  
    2727#define WKContentObservation_h
    2828
    29 #include <TargetConditionals.h>
    30 
    3129#if TARGET_OS_IPHONE
    3230

  • trunk/Source/WebCore/platform/ios/wak/WebCoreThreadMessage.h

    r284713 r284728  
    3232
    3333#ifdef __OBJC__
    34 #import <WebCore/WebCoreThread.h>
     34#import "WebCoreThread.h"
    3535#endif // __OBJC__
    3636

  • trunk/Source/WebKitLegacy/ChangeLog

    r284713 r284728  
     12021-10-22  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r284713.
     4        https://bugs.webkit.org/show_bug.cgi?id=232187
     5
     6        Broke some Apple internal builds
     7
     8        Reverted changeset:
     9
     10        "Add a module map file for PrivateFrameworks/WebKitLegacy"
     11        https://bugs.webkit.org/show_bug.cgi?id=230735
     12        https://commits.webkit.org/r284713
     13
    1142021-10-22  Ian Anderson  <iana@apple.com>
    215

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

    r284713 r284728  
    10371037                84AE905F062DE6A80075BBF9 /* WebDOMOperationsPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDOMOperationsPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    10381038                84CA5F7E042685E800CA2ACA /* WebKitErrorsPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKitErrorsPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    1039                 84E2901126FC3D99005139F2 /* WebKitLegacy.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = WebKitLegacy.modulemap; sourceTree = "<group>"; };
    1040                 84E2901226FC3DA4005139F2 /* WebKitLegacy.private.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = WebKitLegacy.private.modulemap; sourceTree = "<group>"; };
    10411039                930D02BB06275F640076701E /* WebViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebViewInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    10421040                930D02BD06275F710076701E /* WebFrameInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    … …  
    16471645                                089C1665FE841158C02AAC07 /* Resources */,
    16481646                                7C02320E251B8E3A00BA7BB6 /* Scripts */,
    1649                                 534F75362578AAE8005BE7D8 /* Modules */,
    16501647                                0867D69AFE84028FC02AAC07 /* Frameworks and Libraries */,
    16511648                                034768DFFF38A50411DB9C8B /* Products */,
    … …  
    19221919                        );
    19231920                        name = PDF;
    1924                         sourceTree = "<group>";
    1925                 };
    1926                 534F75362578AAE8005BE7D8 /* Modules */ = {
    1927                         isa = PBXGroup;
    1928                         children = (
    1929                                 84E2901126FC3D99005139F2 /* WebKitLegacy.modulemap */,
    1930                                 84E2901226FC3DA4005139F2 /* WebKitLegacy.private.modulemap */,
    1931                         );
    1932                         path = Modules;
    19331921                        sourceTree = "<group>";
    19341922                };

  • trunk/Source/WebKitLegacy/ios/ChangeLog

    r284713 r284728  
     12021-10-22  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r284713.
     4        https://bugs.webkit.org/show_bug.cgi?id=232187
     5
     6        Broke some Apple internal builds
     7
     8        Reverted changeset:
     9
     10        "Add a module map file for PrivateFrameworks/WebKitLegacy"
     11        https://bugs.webkit.org/show_bug.cgi?id=230735
     12        https://commits.webkit.org/r284713
     13
    1142021-10-22  Ian Anderson  <iana@apple.com>
    215

  • trunk/Source/WebKitLegacy/ios/Misc/WebGeolocationCoreLocationProvider.h

    r284713 r284728  
    2424 */
    2525
    26 #if defined(__cplusplus)
     26#import <Foundation/NSObject.h>
    2727
    28 #import <Foundation/Foundation.h>
     28@class CLLocationManager;
     29@class NSString;
    2930
    3031namespace WebCore {
    … …  
    5960- (void)setEnableHighAccuracy:(BOOL)flag;
    6061@end
    61 
    62 #endif

  • trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebFixedPositionContent.h

    r284713 r284728  
    2424 */
    2525
    26 #import <CoreGraphics/CoreGraphics.h>
    2726#import <Foundation/Foundation.h>
    2827

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r284713 r284728  
     12021-10-22  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r284713.
     4        https://bugs.webkit.org/show_bug.cgi?id=232187
     5
     6        Broke some Apple internal builds
     7
     8        Reverted changeset:
     9
     10        "Add a module map file for PrivateFrameworks/WebKitLegacy"
     11        https://bugs.webkit.org/show_bug.cgi?id=230735
     12        https://commits.webkit.org/r284713
     13
    1142021-10-22  Ian Anderson  <iana@apple.com>
    215

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

    r284713 r284728  
    157157OTHER_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;
    158158TAPI_VERIFY_MODE[sdk=iphone*] = Pedantic;
    159 
    160 DEFINES_MODULE = $(DEFINES_MODULE_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
    161 DEFINES_MODULE_COCOA_TOUCH_YES = YES;
    162 
    163 CLANG_MODULES_ENABLE_VERIFIER_TOOL = $(CLANG_MODULES_ENABLE_VERIFIER_TOOL_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH)_$(USE_INTERNAL_SDK));
    164 CLANG_MODULES_ENABLE_VERIFIER_TOOL_COCOA_TOUCH_YES_YES = YES;
    165 
    166 MODULEMAP_FILE = $(MODULEMAP_FILE_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
    167 MODULEMAP_FILE_COCOA_TOUCH_YES = $(SRCROOT)/Modules/WebKitLegacy.modulemap;
    168 
    169 MODULEMAP_PRIVATE_FILE = $(MODULEMAP_PRIVATE_FILE_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
    170 MODULEMAP_PRIVATE_FILE_COCOA_TOUCH_YES = $(SRCROOT)/Modules/WebKitLegacy.private.modulemap;

  • trunk/Source/WebKitLegacy/mac/DOM/DOMEventListener.h

    r284713 r284728  
    2525
    2626#import <WebKitLegacy/WebKitAvailability.h>
    27 #import <objc/NSObject.h>
    2827
    2928@class DOMEvent;

  • trunk/Source/WebKitLegacy/mac/DOM/DOMEventTarget.h

    r284713 r284728  
    2424 */
    2525
    26 #import <Foundation/Foundation.h>
    2726#import <WebKitLegacy/WebKitAvailability.h>
    2827

  • trunk/Source/WebKitLegacy/mac/DOM/DOMNodeFilter.h

    r284713 r284728  
    2525
    2626#import <WebKitLegacy/WebKitAvailability.h>
    27 #import <objc/NSObject.h>
    2827
    2928@class DOMNode;

  • trunk/Source/WebKitLegacy/mac/DOM/DOMXPathNSResolver.h

    r284713 r284728  
    2525
    2626#import <WebKitLegacy/WebKitAvailability.h>
    27 #import <objc/NSObject.h>
    2827
    2928@class NSString;

  • trunk/Source/WebKitLegacy/mac/DOM/WebDOMOperationsPrivate.h

    r284713 r284728  
    2727 */
    2828
    29 #import <Foundation/Foundation.h>
    3029#import <WebKitLegacy/WebDOMOperations.h>
    3130#import <JavaScriptCore/JSBase.h>

  • trunk/Source/WebKitLegacy/mac/History/WebHistoryItemPrivate.h

    r284713 r284728  
    2727 */
    2828
    29 #import <CoreGraphics/CoreGraphics.h>
    3029#import <WebKitLegacy/WebHistoryItem.h>
    3130

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

    r284713 r284728  
    2424 */
    2525
    26 #import <Foundation/Foundation.h>
    27 #import <WebKitLegacy/WebKitAvailability.h>
    28 
    29 #if defined(TARGET_OS_MACCATALYST) && TARGET_OS_MACCATALYST
    30 #import <CFNetwork/CFNSURLConnection.h>
    31 #elif !TARGET_OS_IPHONE || (defined(USE_APPLE_INTERNAL_SDK) && USE_APPLE_INTERNAL_SDK)
    32 #import <Foundation/NSURLDownload.h>
    33 #else
    34 
    3526@interface NSURLDownload : NSObject
    3627@end
    3728
    3829@protocol NSURLDownloadDelegate;
    39 
    40 #endif

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

    r284713 r284728  
    2424 */
    2525
    26 #import <CoreGraphics/CoreGraphics.h>
    27 #import <Foundation/Foundation.h>
    28 
    2926#if TARGET_OS_IPHONE
    3027@class WebFrame;

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

    r284713 r284728  
    2727 */
    2828
     29#import <Foundation/Foundation.h>
     30#import <WebKitLegacy/WebKitAvailability.h>
     31
    2932#ifndef WebDownload_h
    3033#define WebDownload_h
    3134
    32 #import <Foundation/Foundation.h>
    33 #import <WebKitLegacy/WebKitAvailability.h>
    34 
    35 #if defined(TARGET_OS_MACCATALYST) && TARGET_OS_MACCATALYST
     35#if (defined TARGET_OS_MACCATALYST && TARGET_OS_MACCATALYST)
    3636#import <CFNetwork/CFNSURLConnection.h>
    37 #elif !TARGET_OS_IPHONE || (defined(USE_APPLE_INTERNAL_SDK) && USE_APPLE_INTERNAL_SDK)
     37#elif !TARGET_OS_IPHONE || (defined USE_APPLE_INTERNAL_SDK && USE_APPLE_INTERNAL_SDK)
    3838#import <Foundation/NSURLDownload.h>
    3939#else

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

    r284713 r284728  
    2727 */
    2828
    29 #import <Foundation/Foundation.h>
    3029#import <WebKitLegacy/WebKitErrors.h>
    3130

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

    r284713 r284728  
    3030
    3131#ifdef __OBJC__
    32 #import <Foundation/Foundation.h>
     32@class NSBundle;
    3333typedef NSString *WebLocalizedStringType;
    3434#else

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

    r284713 r284728  
    2323 */
    2424
    25 #import <Foundation/Foundation.h>
    26 
    2725@class WebUserContentURLPatternPrivate;
    2826

  • trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebKitPluginHostTypes.h

    r284713 r284728  
    2626#ifndef WebKitPluginHostTypes_h
    2727#define WebKitPluginHostTypes_h
    28 
    29 #include <stdint.h>
    3028
    3129typedef uint8_t* plist_bytes_t;

  • trunk/Source/WebKitLegacy/mac/Plugins/WebPlugin.h

    r284713 r284728  
    2727 */
    2828
    29 #import <CoreGraphics/CoreGraphics.h>
    3029#import <Foundation/Foundation.h>
    3130#import <WebKitLegacy/WebKitAvailability.h>

  • trunk/Source/WebKitLegacy/mac/Plugins/WebPluginContainer.h

    r284713 r284728  
    3131#if !TARGET_OS_IPHONE
    3232#import <AppKit/AppKit.h>
     33@class WebFrame;
    3334#endif
    34 
    35 @class WebFrame;
    3635
    3736/*!

  • trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseManagerPrivate.h

    r284713 r284728  
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28 
    29 #import <Foundation/Foundation.h>
    3028
    3129extern NSString *WebDatabaseDirectoryDefaultsKey;

  • trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseQuotaManager.h

    r284713 r284728  
    2424 */
    2525
    26 #import <WebKitLegacy/WebQuotaManager.h>
    27 #import <objc/NSObject.h>
     26#import "WebQuotaManager.h"
    2827
    2928@interface WebDatabaseQuotaManager : NSObject <WebQuotaManager> {

  • trunk/Source/WebKitLegacy/mac/Storage/WebStorageManagerPrivate.h

    r284713 r284728  
    2424 */
    2525
    26 #import <Foundation/Foundation.h>
    27 
    2826extern NSString * const WebStorageDirectoryDefaultsKey;
    2927extern NSString * const WebStorageDidModifyOriginNotification;

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebCreateFragmentInternal.h

    r284713 r284728  
    2626#pragma once
    2727
    28 #if defined(__cplusplus)
    29 
    30 #import <Foundation/Foundation.h>
    31 
    3228namespace WebCore {
    3329class Document;
    … …  
    3632
    3733extern "C" void _WebCreateFragment(WebCore::Document&, NSAttributedString *, WebCore::FragmentAndResources&);
    38 
    39 #endif

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSecurityOriginPrivate.h

    r284713 r284728  
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28 
    29 #import <Foundation/Foundation.h>
    3028
    3129struct WebSecurityOriginPrivate;

  • trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientation.h

    r284713 r284728  
    2424 */
    2525
    26 #import <objc/NSObject.h>
    27 #import <stdbool.h>
    2826
    2927@class WebDeviceOrientationInternal;

  • trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProvider.h

    r284713 r284728  
    2424 */
    2525
    26 #import <objc/NSObject.h>
    27 
    2826@class WebDeviceOrientation;
    2927

  • trunk/Source/WebKitLegacy/mac/WebView/WebDeviceOrientationProviderMock.h

    r284713 r284728  
    2424 */
    2525
    26 #import <WebKitLegacy/WebDeviceOrientationProvider.h>
    27 #import <objc/NSObject.h>
     26#import "WebDeviceOrientationProvider.h"
    2827
    2928@class WebDeviceOrientationProviderMockInternal;

  • trunk/Source/WebKitLegacy/mac/WebView/WebEditingDelegatePrivate.h

    r284713 r284728  
    2929#import <WebKitLegacy/WebEditingDelegate.h>
    3030
    31 #if TARGET_OS_IPHONE
    32 @class DOMDocumentFragment;
    33 #endif
    3431@class DOMHTMLElement;
    3532

  • trunk/Source/WebKitLegacy/mac/WebView/WebFormDelegatePrivate.h

    r284713 r284728  
    2727 */
    2828
    29 #import <WebKitLegacy/WebFormDelegate.h>
     29#import "WebFormDelegate.h"
    3030
    3131@interface WebFormDelegate (WebPrivate)

  • trunk/Source/WebKitLegacy/mac/WebView/WebGeolocationPosition.h

    r284713 r284728  
    2424 */
    2525
    26 #import <objc/NSObject.h>
    27 
    2826@class WebGeolocationPositionInternal;
    2927

  • trunk/Source/WebKitLegacy/mac/WebView/WebResourceLoadDelegatePrivate.h

    r284713 r284728  
    2727 */
    2828
    29 #import <Foundation/Foundation.h>
    3029#import <TargetConditionals.h>
    3130
    3231@class WebView;
    3332@class WebDataSource;
     33@class NSURLAuthenticationChallenge;
     34@class NSURLResponse;
     35@class NSURLRequest;
    3436
    3537@interface NSObject (WebResourceLoadDelegatePrivate)
Note: See TracChangeset for help on using the changeset viewer.