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

Changeset 284713 in webkit


Ignore:
Timestamp:
Oct 22, 2021, 2:28:21 PM (5 years ago)
Author:
commit-queue@webkit.org
Message:

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

Patch by Ian Anderson <​iana@apple.com> on 2021-10-22
Reviewed by David Kilzer.

Source/WebCore:

Change a few quoted includes to framework style angle includes to
support modularization.
Make sure to define the TARGET_ macros before using them.

  • platform/ios/WebItemProviderPasteboard.h:
  • platform/ios/wak/WAKAppKitStubs.h:
  • platform/ios/wak/WAKResponder.h:
  • platform/ios/wak/WAKView.h:
  • platform/ios/wak/WAKWindow.h:
  • platform/ios/wak/WKContentObservation.h:
  • platform/ios/wak/WebCoreThreadMessage.h:

Source/WebKitLegacy:

Add module map files for WebKitLegacy. The public module is empty
because there are no public headers. The private module map sets
PrivateHeaders as the umbrella directory because there isn't an umbrella
header already. Then it makes an explicit submodule for each header so
as to mimic the non-modular environment.

  • Modules/WebKitLegacy.modulemap: Added.
  • Modules/WebKitLegacy.private.modulemap: Added.
  • WebKitLegacy.xcodeproj/project.pbxproj:

Source/WebKitLegacy/ios:

WebGeolocationCoreLocationProvider.h is an Objective-C++ header, but the
WebKitLegacy module should be usable by plain Objective-C clients. Add
C++ guards so that it can be included in the module.
Add a missing include to WebFixedPositionContent.h.

  • Misc/WebGeolocationCoreLocationProvider.h:
  • WebCoreSupport/WebFixedPositionContent.h:

Source/WebKitLegacy/mac:

Define modules for the Cocoa Touch environment. macOS can't define
modules in WebKitLegacy because it's a nested framework on that
platform.
Enable the modules verifier tool for Apple Internal (it's not supported
in the public Xcode).
Add the Apple Internal guards for NSURLDownload from WebDownload.h to
NSURLDownloadSPI.h so it can be included in the module.
WebCreateFragmentInternal.h is an Objective-C++ header, but the
WebKitLegacy module should be usable by plain Objective-C clients. Add
C++ guards so that it can be included in the module.
Switch a few quoted includes to framework style angle includes, which
are required for modules.
Add some missing includes.

  • Configurations/WebKitLegacy.xcconfig:
  • DOM/DOMEventListener.h:
  • DOM/DOMEventTarget.h:
  • DOM/DOMNodeFilter.h:
  • DOM/DOMXPathNSResolver.h:
  • DOM/WebDOMOperationsPrivate.h:
  • History/WebHistoryItemPrivate.h:
  • Misc/NSURLDownloadSPI.h:
  • Misc/WebCache.h:
  • Misc/WebDownload.h:
  • Misc/WebKitErrorsPrivate.h:
  • Misc/WebLocalizableStrings.h:
  • Misc/WebUserContentURLPattern.h:
  • Plugins/Hosted/WebKitPluginHostTypes.h:
  • Plugins/WebPlugin.h:
  • Plugins/WebPluginContainer.h:
  • Storage/WebDatabaseManagerPrivate.h:
  • Storage/WebDatabaseQuotaManager.h:
  • Storage/WebStorageManagerPrivate.h:
  • WebCoreSupport/WebCreateFragmentInternal.h:
  • WebCoreSupport/WebSecurityOriginPrivate.h:
  • WebView/WebDeviceOrientation.h:
  • WebView/WebDeviceOrientationProvider.h:
  • WebView/WebDeviceOrientationProviderMock.h:
  • WebView/WebEditingDelegatePrivate.h:
  • WebView/WebFormDelegatePrivate.h:
  • WebView/WebGeolocationPosition.h:
  • WebView/WebResourceLoadDelegatePrivate.h:
Location:
trunk/Source
Files:
3 added
42 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r284711 r284713  
     12021-10-22  Ian Anderson  <iana@apple.com>
     2
     3        Add a module map file for PrivateFrameworks/WebKitLegacy
     4        https://bugs.webkit.org/show_bug.cgi?id=230735
     5
     6        Reviewed by David Kilzer.
     7
     8        Change a few quoted includes to framework style angle includes to
     9        support modularization.
     10        Make sure to define the TARGET_ macros before using them.
     11
     12        * platform/ios/WebItemProviderPasteboard.h:
     13        * platform/ios/wak/WAKAppKitStubs.h:
     14        * platform/ios/wak/WAKResponder.h:
     15        * platform/ios/wak/WAKView.h:
     16        * platform/ios/wak/WAKWindow.h:
     17        * platform/ios/wak/WKContentObservation.h:
     18        * platform/ios/wak/WebCoreThreadMessage.h:
     19
    1202021-10-22  Alicia Boya García  <aboya@igalia.com>
    221

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

    r284544 r284713  
    2424 */
    2525
     26#import <CoreGraphics/CoreGraphics.h>
     27
    2628#if TARGET_OS_IPHONE
    2729#import <WebCore/AbstractPasteboard.h>
    … …  
    2931
    3032#if TARGET_OS_IOS
    31 
    32 struct CGSize;
    3333
    3434typedef NS_ENUM(NSInteger, WebPreferredPresentationStyle) {

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

    r251614 r284713  
    2727#define WAKAppKitStubs_h
    2828
     29#import <Foundation/Foundation.h>
     30
    2931#if TARGET_OS_IPHONE
    3032
    3133#import <CoreGraphics/CoreGraphics.h>
    32 #import <Foundation/Foundation.h>
    3334
    3435#ifndef NSClipView

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

    r212251 r284713  
    2727#define WAKResponder_h
    2828
     29#import <Foundation/Foundation.h>
     30
    2931#if TARGET_OS_IPHONE
    3032
    31 #import "WKTypes.h"
    32 #import <Foundation/Foundation.h>
     33#import <WebCore/WKTypes.h>
    3334
    3435@class WebEvent;

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

    r185021 r284713  
    2727#define WAKView_h
    2828
     29#import <Foundation/Foundation.h>
     30
    2931#if TARGET_OS_IPHONE
    3032
    31 #import "WAKAppKitStubs.h"
    32 #import "WAKResponder.h"
    33 #import <Foundation/Foundation.h>
    3433#import <CoreGraphics/CoreGraphics.h>
     34#import <WebCore/WAKAppKitStubs.h>
     35#import <WebCore/WAKResponder.h>
    3536
    3637extern NSString *WAKViewFrameSizeDidChangeNotification;

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

    r273639 r284713  
    2626#pragma once
    2727
     28#import <Foundation/Foundation.h>
     29
    2830#if TARGET_OS_IPHONE
    2931
    30 #import "WAKAppKitStubs.h"
    31 #import "WAKView.h"
    32 #import "WKContentObservation.h"
    3332#import <CoreGraphics/CoreGraphics.h>
    34 #import <Foundation/Foundation.h>
     33#import <WebCore/WAKAppKitStubs.h>
     34#import <WebCore/WAKView.h>
     35#import <WebCore/WKContentObservation.h>
    3536
    3637@class CALayer;

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

    r244588 r284713  
    2727#define WKContentObservation_h
    2828
     29#include <TargetConditionals.h>
     30
    2931#if TARGET_OS_IPHONE
    3032

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

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

  • trunk/Source/WebKitLegacy/ChangeLog

    r284162 r284713  
     12021-10-22  Ian Anderson  <iana@apple.com>
     2
     3        Add a module map file for PrivateFrameworks/WebKitLegacy
     4        https://bugs.webkit.org/show_bug.cgi?id=230735
     5
     6        Reviewed by David Kilzer.
     7
     8        Add module map files for WebKitLegacy. The public module is empty
     9        because there are no public headers. The private module map sets
     10        PrivateHeaders as the umbrella directory because there isn't an umbrella
     11        header already. Then it makes an explicit submodule for each header so
     12        as to mimic the non-modular environment.
     13
     14        * Modules/WebKitLegacy.modulemap: Added.
     15        * Modules/WebKitLegacy.private.modulemap: Added.
     16        * WebKitLegacy.xcodeproj/project.pbxproj:
     17
    1182021-10-14  Chris Dumez  <cdumez@apple.com>
    219

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

    r283403 r284713  
    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>"; };
    10391041                930D02BB06275F640076701E /* WebViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebViewInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    10401042                930D02BD06275F710076701E /* WebFrameInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    … …  
    16451647                                089C1665FE841158C02AAC07 /* Resources */,
    16461648                                7C02320E251B8E3A00BA7BB6 /* Scripts */,
     1649                                534F75362578AAE8005BE7D8 /* Modules */,
    16471650                                0867D69AFE84028FC02AAC07 /* Frameworks and Libraries */,
    16481651                                034768DFFF38A50411DB9C8B /* Products */,
    … …  
    19191922                        );
    19201923                        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;
    19211933                        sourceTree = "<group>";
    19221934                };

  • trunk/Source/WebKitLegacy/ios/ChangeLog

    r284559 r284713  
     12021-10-22  Ian Anderson  <iana@apple.com>
     2
     3        Add a module map file for PrivateFrameworks/WebKitLegacy
     4        https://bugs.webkit.org/show_bug.cgi?id=230735
     5
     6        Reviewed by David Kilzer.
     7
     8        WebGeolocationCoreLocationProvider.h is an Objective-C++ header, but the
     9        WebKitLegacy module should be usable by plain Objective-C clients. Add
     10        C++ guards so that it can be included in the module.
     11        Add a missing include to WebFixedPositionContent.h.
     12
     13        * Misc/WebGeolocationCoreLocationProvider.h:
     14        * WebCoreSupport/WebFixedPositionContent.h:
     15
    1162021-10-20  David Kilzer  <ddkilzer@apple.com>
    217

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

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

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

    r212903 r284713  
    2424 */
    2525
     26#import <CoreGraphics/CoreGraphics.h>
    2627#import <Foundation/Foundation.h>
    2728

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r284630 r284713  
     12021-10-22  Ian Anderson  <iana@apple.com>
     2
     3        Add a module map file for PrivateFrameworks/WebKitLegacy
     4        https://bugs.webkit.org/show_bug.cgi?id=230735
     5
     6        Reviewed by David Kilzer.
     7
     8        Define modules for the Cocoa Touch environment. macOS can't define
     9        modules in WebKitLegacy because it's a nested framework on that
     10        platform.
     11        Enable the modules verifier tool for Apple Internal (it's not supported
     12        in the public Xcode).
     13        Add the Apple Internal guards for NSURLDownload from WebDownload.h to
     14        NSURLDownloadSPI.h so it can be included in the module.
     15        WebCreateFragmentInternal.h is an Objective-C++ header, but the
     16        WebKitLegacy module should be usable by plain Objective-C clients. Add
     17        C++ guards so that it can be included in the module.
     18        Switch a few quoted includes to framework style angle includes, which
     19        are required for modules.
     20        Add some missing includes.
     21
     22        * Configurations/WebKitLegacy.xcconfig:
     23        * DOM/DOMEventListener.h:
     24        * DOM/DOMEventTarget.h:
     25        * DOM/DOMNodeFilter.h:
     26        * DOM/DOMXPathNSResolver.h:
     27        * DOM/WebDOMOperationsPrivate.h:
     28        * History/WebHistoryItemPrivate.h:
     29        * Misc/NSURLDownloadSPI.h:
     30        * Misc/WebCache.h:
     31        * Misc/WebDownload.h:
     32        * Misc/WebKitErrorsPrivate.h:
     33        * Misc/WebLocalizableStrings.h:
     34        * Misc/WebUserContentURLPattern.h:
     35        * Plugins/Hosted/WebKitPluginHostTypes.h:
     36        * Plugins/WebPlugin.h:
     37        * Plugins/WebPluginContainer.h:
     38        * Storage/WebDatabaseManagerPrivate.h:
     39        * Storage/WebDatabaseQuotaManager.h:
     40        * Storage/WebStorageManagerPrivate.h:
     41        * WebCoreSupport/WebCreateFragmentInternal.h:
     42        * WebCoreSupport/WebSecurityOriginPrivate.h:
     43        * WebView/WebDeviceOrientation.h:
     44        * WebView/WebDeviceOrientationProvider.h:
     45        * WebView/WebDeviceOrientationProviderMock.h:
     46        * WebView/WebEditingDelegatePrivate.h:
     47        * WebView/WebFormDelegatePrivate.h:
     48        * WebView/WebGeolocationPosition.h:
     49        * WebView/WebResourceLoadDelegatePrivate.h:
     50
    1512021-10-19  Darin Adler  <darin@apple.com>
    252

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

    r283403 r284713  
    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
     160DEFINES_MODULE = $(DEFINES_MODULE_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
     161DEFINES_MODULE_COCOA_TOUCH_YES = YES;
     162
     163CLANG_MODULES_ENABLE_VERIFIER_TOOL = $(CLANG_MODULES_ENABLE_VERIFIER_TOOL_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH)_$(USE_INTERNAL_SDK));
     164CLANG_MODULES_ENABLE_VERIFIER_TOOL_COCOA_TOUCH_YES_YES = YES;
     165
     166MODULEMAP_FILE = $(MODULEMAP_FILE_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
     167MODULEMAP_FILE_COCOA_TOUCH_YES = $(SRCROOT)/Modules/WebKitLegacy.modulemap;
     168
     169MODULEMAP_PRIVATE_FILE = $(MODULEMAP_PRIVATE_FILE_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
     170MODULEMAP_PRIVATE_FILE_COCOA_TOUCH_YES = $(SRCROOT)/Modules/WebKitLegacy.private.modulemap;

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

    r231383 r284713  
    2525
    2626#import <WebKitLegacy/WebKitAvailability.h>
     27#import <objc/NSObject.h>
    2728
    2829@class DOMEvent;

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

    r231383 r284713  
    2424 */
    2525
     26#import <Foundation/Foundation.h>
    2627#import <WebKitLegacy/WebKitAvailability.h>
    2728

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

    r231383 r284713  
    2525
    2626#import <WebKitLegacy/WebKitAvailability.h>
     27#import <objc/NSObject.h>
    2728
    2829@class DOMNode;

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

    r231383 r284713  
    2525
    2626#import <WebKitLegacy/WebKitAvailability.h>
     27#import <objc/NSObject.h>
    2728
    2829@class NSString;

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

    r248373 r284713  
    2727 */
    2828
     29#import <Foundation/Foundation.h>
    2930#import <WebKitLegacy/WebDOMOperations.h>
    3031#import <JavaScriptCore/JSBase.h>

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

    r251220 r284713  
    2727 */
    2828
     29#import <CoreGraphics/CoreGraphics.h>
    2930#import <WebKitLegacy/WebHistoryItem.h>
    3031

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

    r237610 r284713  
    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
    2635@interface NSURLDownload : NSObject
    2736@end
    2837
    2938@protocol NSURLDownloadDelegate;
     39
     40#endif

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

    r249498 r284713  
    2424 */
    2525
     26#import <CoreGraphics/CoreGraphics.h>
     27#import <Foundation/Foundation.h>
     28
    2629#if TARGET_OS_IPHONE
    2730@class WebFrame;

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

    r263986 r284713  
    2727 */
    2828
     29#ifndef WebDownload_h
     30#define WebDownload_h
     31
    2932#import <Foundation/Foundation.h>
    3033#import <WebKitLegacy/WebKitAvailability.h>
    3134
    32 #ifndef WebDownload_h
    33 #define WebDownload_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

    r203435 r284713  
    2727 */
    2828
     29#import <Foundation/Foundation.h>
    2930#import <WebKitLegacy/WebKitErrors.h>
    3031

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

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

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

    r215685 r284713  
    2323 */
    2424
     25#import <Foundation/Foundation.h>
     26
    2527@class WebUserContentURLPatternPrivate;
    2628

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

    r95901 r284713  
    2626#ifndef WebKitPluginHostTypes_h
    2727#define WebKitPluginHostTypes_h
     28
     29#include <stdint.h>
    2830
    2931typedef uint8_t* plist_bytes_t;

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

    r168047 r284713  
    2727 */
    2828
     29#import <CoreGraphics/CoreGraphics.h>
    2930#import <Foundation/Foundation.h>
    3031#import <WebKitLegacy/WebKitAvailability.h>

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

    r219165 r284713  
    3131#if !TARGET_OS_IPHONE
    3232#import <AppKit/AppKit.h>
     33#endif
     34
    3335@class WebFrame;
    34 #endif
    3536
    3637/*!

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

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

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

    r215685 r284713  
    2424 */
    2525
    26 #import "WebQuotaManager.h"
     26#import <WebKitLegacy/WebQuotaManager.h>
     27#import <objc/NSObject.h>
    2728
    2829@interface WebDatabaseQuotaManager : NSObject <WebQuotaManager> {

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

    r136323 r284713  
    2424 */
    2525
     26#import <Foundation/Foundation.h>
     27
    2628extern NSString * const WebStorageDirectoryDefaultsKey;
    2729extern NSString * const WebStorageDidModifyOriginNotification;

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

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

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

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

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

    r215685 r284713  
    2424 */
    2525
     26#import <objc/NSObject.h>
     27#import <stdbool.h>
    2628
    2729@class WebDeviceOrientationInternal;

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

    r95901 r284713  
    2424 */
    2525
     26#import <objc/NSObject.h>
     27
    2628@class WebDeviceOrientation;
    2729

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

    r215685 r284713  
    2424 */
    2525
    26 #import "WebDeviceOrientationProvider.h"
     26#import <WebKitLegacy/WebDeviceOrientationProvider.h>
     27#import <objc/NSObject.h>
    2728
    2829@class WebDeviceOrientationProviderMockInternal;

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

    r175647 r284713  
    2929#import <WebKitLegacy/WebEditingDelegate.h>
    3030
     31#if TARGET_OS_IPHONE
     32@class DOMDocumentFragment;
     33#endif
    3134@class DOMHTMLElement;
    3235

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

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

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

    r215685 r284713  
    2424 */
    2525
     26#import <objc/NSObject.h>
     27
    2628@class WebGeolocationPositionInternal;
    2729

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

    r212128 r284713  
    2727 */
    2828
     29#import <Foundation/Foundation.h>
    2930#import <TargetConditionals.h>
    3031
    3132@class WebView;
    3233@class WebDataSource;
    33 @class NSURLAuthenticationChallenge;
    34 @class NSURLResponse;
    35 @class NSURLRequest;
    3634
    3735@interface NSObject (WebResourceLoadDelegatePrivate)
Note: See TracChangeset for help on using the changeset viewer.