Changeset 155770 in webkit


Ignore:
Timestamp:
Sep 14, 2013 10:06:43 AM (11 years ago)
Author:
mitz@apple.com
Message:

[mac] Public header WKBase.h imports a private header, WKBaseMac.h
​https://bugs.webkit.org/show_bug.cgi?id=121216

Reviewed by Darin Adler.

  • Shared/API/c/WKBase.h: Moved definitions of enums and WK_EXPORT and WK_INLINE macros

out of this files.

  • Shared/API/c/WKDeclarationSpecifiers.h: Copied from Source/WebKit2/Shared/API/c/WKBase.h.

Contains definitions of WK_EXPORT and WK_INLINE.

  • Shared/API/c/WKSharedAPICast.h: Added #includes.
  • Shared/API/c/WKUserContentInjectedFrames.h: Copied from Source/WebKit2/Shared/API/c/WKBase.h.

Contains enum definition.

  • Shared/API/c/WKUserScriptInjectionTime.h: Copied from Source/WebKit2/Shared/API/c/WKBase.h.

Contains enum definition.

  • UIProcess/API/C/WKPageGroup.h: Added #includes.
  • UIProcess/API/mac/WKBrowsingContextController.h: Removed WKBase.h import from this public

header, replacing it with WKDeclarationSpecifiers.h import.

  • UIProcess/API/mac/WKBrowsingContextControllerPrivate.h: Added WKBase.h import.
  • UIProcess/API/mac/WKBrowsingContextGroup.h: Removed WKBase.h import from this public

header, added necessary public imports.

  • UIProcess/API/mac/WKBrowsingContextGroupPrivate.h: Added WKBase.h import.
  • UIProcess/API/mac/WKBrowsingContextLoadDelegate.h: Removed WKBase.h import from public

header.

  • UIProcess/API/mac/WKConnection.h: Ditto. Added WKDeclarationSpecifiers.h import.
  • UIProcess/API/mac/WKConnectionInternal.h: Added WKBase.h import.
  • UIProcess/API/mac/WKProcessGroup.h: Removed WKBase.h import from public header, added

WKDeclarationSpecifiers.h import.

  • UIProcess/API/mac/WKProcessGroupPrivate.h: Added WKBase.h import.
  • UIProcess/API/mac/WKView.h: Removed WKBase.h import from public header, added

WKDeclarationSpecifiers.h import.

  • WebKit2.xcodeproj/project.pbxproj: Added new public header files, made WKBase.h private.
  • WebProcess/InjectedBundle/API/mac/WKDOMNode.h: Removed WKBase.h import from public header,

added WKDeclarationSpecifiers.h import.

  • WebProcess/InjectedBundle/API/mac/WKDOMNodePrivate.h: Added WKBase.h import.
  • WebProcess/InjectedBundle/API/mac/WKDOMRange.h: Removed WKBase.h import from public

header, added WKDeclarationSpecifiers.h import.

  • WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h: Added WKBase.h import.
  • WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.h: Removed WKBase.h import from public

header, added WKDeclarationSpecifiers.h import.

  • WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h: Ditto.
  • WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerInternal.h:

Added WKBase.h import.

Location:
trunk/Source/WebKit2
Files:
23 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r155768 r155770  
     12013-09-14  Dan Bernstein  <mitz@apple.com>
     2
     3        [mac] Public header WKBase.h imports a private header, WKBaseMac.h
     4        https://bugs.webkit.org/show_bug.cgi?id=121216
     5
     6        Reviewed by Darin Adler.
     7
     8        * Shared/API/c/WKBase.h: Moved definitions of enums and WK_EXPORT and WK_INLINE macros
     9        out of this files.
     10        * Shared/API/c/WKDeclarationSpecifiers.h: Copied from Source/WebKit2/Shared/API/c/WKBase.h.
     11        Contains definitions of WK_EXPORT and WK_INLINE.
     12        * Shared/API/c/WKSharedAPICast.h: Added #includes.
     13        * Shared/API/c/WKUserContentInjectedFrames.h: Copied from Source/WebKit2/Shared/API/c/WKBase.h.
     14        Contains enum definition.
     15        * Shared/API/c/WKUserScriptInjectionTime.h: Copied from Source/WebKit2/Shared/API/c/WKBase.h.
     16        Contains enum definition.
     17        * UIProcess/API/C/WKPageGroup.h: Added #includes.
     18        * UIProcess/API/mac/WKBrowsingContextController.h: Removed WKBase.h import from this public
     19        header, replacing it with WKDeclarationSpecifiers.h import.
     20        * UIProcess/API/mac/WKBrowsingContextControllerPrivate.h: Added WKBase.h import.
     21        * UIProcess/API/mac/WKBrowsingContextGroup.h: Removed WKBase.h import from this public
     22        header, added necessary public imports.
     23        * UIProcess/API/mac/WKBrowsingContextGroupPrivate.h: Added WKBase.h import.
     24        * UIProcess/API/mac/WKBrowsingContextLoadDelegate.h: Removed WKBase.h import from public
     25        header.
     26        * UIProcess/API/mac/WKConnection.h: Ditto. Added WKDeclarationSpecifiers.h import.
     27        * UIProcess/API/mac/WKConnectionInternal.h: Added WKBase.h import.
     28        * UIProcess/API/mac/WKProcessGroup.h: Removed WKBase.h import from public header, added
     29        WKDeclarationSpecifiers.h import.
     30        * UIProcess/API/mac/WKProcessGroupPrivate.h: Added WKBase.h import.
     31        * UIProcess/API/mac/WKView.h: Removed WKBase.h import from public header, added
     32        WKDeclarationSpecifiers.h import.
     33        * WebKit2.xcodeproj/project.pbxproj: Added new public header files, made WKBase.h private.
     34        * WebProcess/InjectedBundle/API/mac/WKDOMNode.h: Removed WKBase.h import from public header,
     35        added WKDeclarationSpecifiers.h import.
     36        * WebProcess/InjectedBundle/API/mac/WKDOMNodePrivate.h: Added WKBase.h import.
     37        * WebProcess/InjectedBundle/API/mac/WKDOMRange.h: Removed WKBase.h import from public
     38        header, added WKDeclarationSpecifiers.h import.
     39        * WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h: Added WKBase.h import.
     40        * WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.h: Removed WKBase.h import from public
     41        header, added WKDeclarationSpecifiers.h import.
     42        * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h: Ditto.
     43        * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerInternal.h:
     44        Added WKBase.h import.
     45
    1462013-09-14  Alberto Garcia  <berto@igalia.com>
    247

  • trunk/Source/WebKit2/Shared/API/c/WKBase.h

    r150432 r155770  
    2828#define WKBase_h
    2929
     30#include <WebKit2/WKDeclarationSpecifiers.h>
    3031#include <stdint.h>
    3132
    … …  
    8182typedef const struct OpaqueWKWebArchive* WKWebArchiveRef;
    8283typedef const struct OpaqueWKWebArchiveResource* WKWebArchiveResourceRef;
    83 
    84 enum WKUserContentInjectedFrames {
    85     kWKInjectInAllFrames,
    86     kWKInjectInTopFrameOnly
    87 };
    88 typedef enum WKUserContentInjectedFrames WKUserContentInjectedFrames;
    89 
    90 enum WKUserScriptInjectionTime {
    91     kWKInjectAtDocumentStart,
    92     kWKInjectAtDocumentEnd
    93 };
    94 typedef enum WKUserScriptInjectionTime WKUserScriptInjectionTime;
    9584
    9685/* WebKit2 main API types */
    … …  
    159148typedef const struct OpaqueWKBundleScriptWorld* WKBundleScriptWorldRef;
    160149
    161 #undef WK_EXPORT
    162 #if defined(WK_NO_EXPORT)
    163 #define WK_EXPORT
    164 #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
    165 #define WK_EXPORT __attribute__((visibility("default")))
    166 #elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE) || defined(__CC_ARM) || defined(__ARMCC__)
    167 #if BUILDING_WEBKIT
    168 #define WK_EXPORT __declspec(dllexport)
    169 #else
    170 #define WK_EXPORT __declspec(dllimport)
    171 #endif
    172 #else /* !defined(WK_NO_EXPORT) */
    173 #define WK_EXPORT
    174 #endif /* defined(WK_NO_EXPORT) */
    175 
    176 #if !defined(WK_INLINE)
    177 #if defined(__cplusplus)
    178 #define WK_INLINE static inline
    179 #elif defined(__GNUC__)
    180 #define WK_INLINE static __inline__
    181 #elif defined(__WIN32__)
    182 #define WK_INLINE static __inline
    183 #else
    184 #define WK_INLINE static   
    185 #endif
    186 #endif /* !defined(WK_INLINE) */
    187 
    188150#endif /* WKBase_h */

  • trunk/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h

    r155754 r155770  
    2525 */
    2626
    27 #ifndef WKBase_h
    28 #define WKBase_h
    29 
    30 #include <stdint.h>
    31 
    32 #if defined(BUILDING_GTK__)
    33 #include <WebKit2/WKBaseGtk.h>
    34 #endif
    35 
    36 #if defined(WTF_USE_SOUP)
    37 #include <WebKit2/WKBaseSoup.h>
    38 #endif
    39 
    40 #if defined(BUILDING_EFL__)
    41 #include <WebKit2/WKBaseEfl.h>
    42 #endif
    43 
    44 #if defined(__APPLE__) && !defined(BUILDING_QT__)
    45 #include <WebKit2/WKBaseMac.h>
    46 #endif
    47 
    48 /* WebKit2 shared types */
    49 
    50 typedef uint32_t WKTypeID;
    51 typedef const void* WKTypeRef;
    52 
    53 typedef const struct OpaqueWKArray* WKArrayRef;
    54 typedef struct OpaqueWKArray* WKMutableArrayRef;
    55 
    56 typedef const struct OpaqueWKDictionary* WKDictionaryRef;
    57 typedef struct OpaqueWKDictionary* WKMutableDictionaryRef;
    58 
    59 typedef const struct OpaqueWKBoolean* WKBooleanRef;
    60 typedef const struct OpaqueWKCertificateInfo* WKCertificateInfoRef;
    61 typedef const struct OpaqueWKConnection* WKConnectionRef;
    62 typedef const struct OpaqueWKContextMenuItem* WKContextMenuItemRef;
    63 typedef const struct OpaqueWKData* WKDataRef;
    64 typedef const struct OpaqueWKDouble* WKDoubleRef;
    65 typedef const struct OpaqueWKError* WKErrorRef;
    66 typedef const struct OpaqueWKGraphicsContext* WKGraphicsContextRef;
    67 typedef const struct OpaqueWKImage* WKImageRef;
    68 typedef const struct OpaqueWKPointRef* WKPointRef;
    69 typedef const struct OpaqueWKRectRef* WKRectRef;
    70 typedef const struct OpaqueWKRenderLayer* WKRenderLayerRef;
    71 typedef const struct OpaqueWKRenderObject* WKRenderObjectRef;
    72 typedef const struct OpaqueWKSecurityOrigin* WKSecurityOriginRef;
    73 typedef const struct OpaqueWKSerializedScriptValue* WKSerializedScriptValueRef;
    74 typedef const struct OpaqueWKSizeRef* WKSizeRef;
    75 typedef const struct OpaqueWKString* WKStringRef;
    76 typedef const struct OpaqueWKUInt64* WKUInt64Ref;
    77 typedef const struct OpaqueWKURL* WKURLRef;
    78 typedef const struct OpaqueWKURLRequest* WKURLRequestRef;
    79 typedef const struct OpaqueWKURLResponse* WKURLResponseRef;
    80 typedef const struct OpaqueWKUserContentURLPattern* WKUserContentURLPatternRef;
    81 typedef const struct OpaqueWKWebArchive* WKWebArchiveRef;
    82 typedef const struct OpaqueWKWebArchiveResource* WKWebArchiveResourceRef;
    83 
    84 enum WKUserContentInjectedFrames {
    85     kWKInjectInAllFrames,
    86     kWKInjectInTopFrameOnly
    87 };
    88 typedef enum WKUserContentInjectedFrames WKUserContentInjectedFrames;
    89 
    90 enum WKUserScriptInjectionTime {
    91     kWKInjectAtDocumentStart,
    92     kWKInjectAtDocumentEnd
    93 };
    94 typedef enum WKUserScriptInjectionTime WKUserScriptInjectionTime;
    95 
    96 /* WebKit2 main API types */
    97 
    98 typedef const struct OpaqueWKApplicationCacheManager* WKApplicationCacheManagerRef;
    99 typedef const struct OpaqueWKAuthenticationChallenge* WKAuthenticationChallengeRef;
    100 typedef const struct OpaqueWKAuthenticationDecisionListener* WKAuthenticationDecisionListenerRef;
    101 typedef const struct OpaqueWKBackForwardList* WKBackForwardListRef;
    102 typedef const struct OpaqueWKBackForwardListItem* WKBackForwardListItemRef;
    103 typedef const struct OpaqueWKBatteryManager* WKBatteryManagerRef;
    104 typedef const struct OpaqueWKBatteryStatus* WKBatteryStatusRef;
    105 typedef const struct OpaqueWKResourceCacheManager* WKResourceCacheManagerRef;
    106 typedef const struct OpaqueWKColorPickerResultListener* WKColorPickerResultListenerRef;
    107 typedef const struct OpaqueWKContext* WKContextRef;
    108 typedef const struct OpaqueWKCookieManager* WKCookieManagerRef;
    109 typedef const struct OpaqueWKCredential* WKCredentialRef;
    110 typedef const struct OpaqueWKDatabaseManager* WKDatabaseManagerRef;
    111 typedef const struct OpaqueWKDownload* WKDownloadRef;
    112 typedef const struct OpaqueWKFormSubmissionListener* WKFormSubmissionListenerRef;
    113 typedef const struct OpaqueWKFrame* WKFrameRef;
    114 typedef const struct OpaqueWKFramePolicyListener* WKFramePolicyListenerRef;
    115 typedef const struct OpaqueWKGeolocationManager* WKGeolocationManagerRef;
    116 typedef const struct OpaqueWKGeolocationPermissionRequest* WKGeolocationPermissionRequestRef;
    117 typedef const struct OpaqueWKGeolocationPosition* WKGeolocationPositionRef;
    118 typedef const struct OpaqueWKGrammarDetail* WKGrammarDetailRef;
    119 typedef const struct OpaqueWKHitTestResult* WKHitTestResultRef;
    120 typedef const struct OpaqueWKIconDatabase* WKIconDatabaseRef;
    121 typedef const struct OpaqueWKInspector* WKInspectorRef;
    122 typedef const struct OpaqueWKKeyValueStorageManager* WKKeyValueStorageManagerRef;
    123 typedef const struct OpaqueWKMediaCacheManager* WKMediaCacheManagerRef;
    124 typedef const struct OpaqueWKNavigationData* WKNavigationDataRef;
    125 typedef const struct OpaqueWKNetworkInfoManager* WKNetworkInfoManagerRef;
    126 typedef const struct OpaqueWKNetworkInfo* WKNetworkInfoRef;
    127 typedef const struct OpaqueWKNotification* WKNotificationRef;
    128 typedef const struct OpaqueWKNotificationManager* WKNotificationManagerRef;
    129 typedef const struct OpaqueWKNotificationPermissionRequest* WKNotificationPermissionRequestRef;
    130 typedef const struct OpaqueWKNotificationProvider* WKNotificationProviderRef;
    131 typedef const struct OpaqueWKOpenPanelParameters* WKOpenPanelParametersRef;
    132 typedef const struct OpaqueWKOpenPanelResultListener* WKOpenPanelResultListenerRef;
    133 typedef const struct OpaqueWKPage* WKPageRef;
    134 typedef const struct OpaqueWKPageGroup* WKPageGroupRef;
    135 typedef const struct OpaqueWKPluginSiteDataManager* WKPluginSiteDataManagerRef;
    136 typedef const struct OpaqueWKPreferences* WKPreferencesRef;
    137 typedef const struct OpaqueWKProtectionSpace* WKProtectionSpaceRef;
    138 typedef const struct OpaqueWKTextChecker* WKTextCheckerRef;
    139 typedef const struct OpaqueWKVibration* WKVibrationRef;
    140 typedef const struct OpaqueWKViewportAttributes* WKViewportAttributesRef;
    141 
    142 /* WebKit2 Bundle types */
    143 
    144 typedef const struct OpaqueWKBundle* WKBundleRef;
    145 typedef const struct OpaqueWKBundleBackForwardList* WKBundleBackForwardListRef;
    146 typedef const struct OpaqueWKBundleBackForwardListItem* WKBundleBackForwardListItemRef;
    147 typedef const struct OpaqueWKBundleDOMCSSStyleDeclaration* WKBundleCSSStyleDeclarationRef;
    148 typedef const struct OpaqueWKBundleDOMWindowExtension* WKBundleDOMWindowExtensionRef;
    149 typedef const struct OpaqueWKBundleFrame* WKBundleFrameRef;
    150 typedef const struct OpaqueWKBundleHitTestResult* WKBundleHitTestResultRef;
    151 typedef const struct OpaqueWKBundleInspector* WKBundleInspectorRef;
    152 typedef const struct OpaqueWKBundleNavigationAction* WKBundleNavigationActionRef;
    153 typedef const struct OpaqueWKBundleNodeHandle* WKBundleNodeHandleRef;
    154 typedef const struct OpaqueWKBundlePage* WKBundlePageRef;
    155 typedef const struct OpaqueWKBundlePageBanner* WKBundlePageBannerRef;
    156 typedef const struct OpaqueWKBundlePageGroup* WKBundlePageGroupRef;
    157 typedef const struct OpaqueWKBundlePageOverlay* WKBundlePageOverlayRef;
    158 typedef const struct OpaqueWKBundleRangeHandle* WKBundleRangeHandleRef;
    159 typedef const struct OpaqueWKBundleScriptWorld* WKBundleScriptWorldRef;
     27#ifndef WKDeclarationSpecifiers_h
     28#define WKDeclarationSpecifiers_h
    16029
    16130#undef WK_EXPORT
    … …  
    18655#endif /* !defined(WK_INLINE) */
    18756
    188 #endif /* WKBase_h */
     57#endif /* WKDeclarationSpecifiers_h */

  • trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h

    r155357 r155770  
    3838#include "WKPageLoadTypesPrivate.h"
    3939#include "WKPageVisibilityTypes.h"
     40#include "WKUserContentInjectedFrames.h"
     41#include "WKUserScriptInjectionTime.h"
    4042#include "WebError.h"
    4143#include "WebEvent.h"

  • trunk/Source/WebKit2/Shared/API/c/WKUserContentInjectedFrames.h

    r155754 r155770  
    11/*
    2  * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
    3  * Portions Copyright (c) 2010 Motorola Mobility, Inc.  All rights reserved.
     2 * Copyright (C) 2012 Apple Inc. All rights reserved.
    43 *
    54 * Redistribution and use in source and binary forms, with or without
    … …  
    2524 */
    2625
    27 #ifndef WKBase_h
    28 #define WKBase_h
    29 
    30 #include <stdint.h>
    31 
    32 #if defined(BUILDING_GTK__)
    33 #include <WebKit2/WKBaseGtk.h>
    34 #endif
    35 
    36 #if defined(WTF_USE_SOUP)
    37 #include <WebKit2/WKBaseSoup.h>
    38 #endif
    39 
    40 #if defined(BUILDING_EFL__)
    41 #include <WebKit2/WKBaseEfl.h>
    42 #endif
    43 
    44 #if defined(__APPLE__) && !defined(BUILDING_QT__)
    45 #include <WebKit2/WKBaseMac.h>
    46 #endif
    47 
    48 /* WebKit2 shared types */
    49 
    50 typedef uint32_t WKTypeID;
    51 typedef const void* WKTypeRef;
    52 
    53 typedef const struct OpaqueWKArray* WKArrayRef;
    54 typedef struct OpaqueWKArray* WKMutableArrayRef;
    55 
    56 typedef const struct OpaqueWKDictionary* WKDictionaryRef;
    57 typedef struct OpaqueWKDictionary* WKMutableDictionaryRef;
    58 
    59 typedef const struct OpaqueWKBoolean* WKBooleanRef;
    60 typedef const struct OpaqueWKCertificateInfo* WKCertificateInfoRef;
    61 typedef const struct OpaqueWKConnection* WKConnectionRef;
    62 typedef const struct OpaqueWKContextMenuItem* WKContextMenuItemRef;
    63 typedef const struct OpaqueWKData* WKDataRef;
    64 typedef const struct OpaqueWKDouble* WKDoubleRef;
    65 typedef const struct OpaqueWKError* WKErrorRef;
    66 typedef const struct OpaqueWKGraphicsContext* WKGraphicsContextRef;
    67 typedef const struct OpaqueWKImage* WKImageRef;
    68 typedef const struct OpaqueWKPointRef* WKPointRef;
    69 typedef const struct OpaqueWKRectRef* WKRectRef;
    70 typedef const struct OpaqueWKRenderLayer* WKRenderLayerRef;
    71 typedef const struct OpaqueWKRenderObject* WKRenderObjectRef;
    72 typedef const struct OpaqueWKSecurityOrigin* WKSecurityOriginRef;
    73 typedef const struct OpaqueWKSerializedScriptValue* WKSerializedScriptValueRef;
    74 typedef const struct OpaqueWKSizeRef* WKSizeRef;
    75 typedef const struct OpaqueWKString* WKStringRef;
    76 typedef const struct OpaqueWKUInt64* WKUInt64Ref;
    77 typedef const struct OpaqueWKURL* WKURLRef;
    78 typedef const struct OpaqueWKURLRequest* WKURLRequestRef;
    79 typedef const struct OpaqueWKURLResponse* WKURLResponseRef;
    80 typedef const struct OpaqueWKUserContentURLPattern* WKUserContentURLPatternRef;
    81 typedef const struct OpaqueWKWebArchive* WKWebArchiveRef;
    82 typedef const struct OpaqueWKWebArchiveResource* WKWebArchiveResourceRef;
     26#ifndef WKUserContentInjectedFrames_h
     27#define WKUserContentInjectedFrames_h
    8328
    8429enum WKUserContentInjectedFrames {
    … …  
    8833typedef enum WKUserContentInjectedFrames WKUserContentInjectedFrames;
    8934
    90 enum WKUserScriptInjectionTime {
    91     kWKInjectAtDocumentStart,
    92     kWKInjectAtDocumentEnd
    93 };
    94 typedef enum WKUserScriptInjectionTime WKUserScriptInjectionTime;
    95 
    96 /* WebKit2 main API types */
    97 
    98 typedef const struct OpaqueWKApplicationCacheManager* WKApplicationCacheManagerRef;
    99 typedef const struct OpaqueWKAuthenticationChallenge* WKAuthenticationChallengeRef;
    100 typedef const struct OpaqueWKAuthenticationDecisionListener* WKAuthenticationDecisionListenerRef;
    101 typedef const struct OpaqueWKBackForwardList* WKBackForwardListRef;
    102 typedef const struct OpaqueWKBackForwardListItem* WKBackForwardListItemRef;
    103 typedef const struct OpaqueWKBatteryManager* WKBatteryManagerRef;
    104 typedef const struct OpaqueWKBatteryStatus* WKBatteryStatusRef;
    105 typedef const struct OpaqueWKResourceCacheManager* WKResourceCacheManagerRef;
    106 typedef const struct OpaqueWKColorPickerResultListener* WKColorPickerResultListenerRef;
    107 typedef const struct OpaqueWKContext* WKContextRef;
    108 typedef const struct OpaqueWKCookieManager* WKCookieManagerRef;
    109 typedef const struct OpaqueWKCredential* WKCredentialRef;
    110 typedef const struct OpaqueWKDatabaseManager* WKDatabaseManagerRef;
    111 typedef const struct OpaqueWKDownload* WKDownloadRef;
    112 typedef const struct OpaqueWKFormSubmissionListener* WKFormSubmissionListenerRef;
    113 typedef const struct OpaqueWKFrame* WKFrameRef;
    114 typedef const struct OpaqueWKFramePolicyListener* WKFramePolicyListenerRef;
    115 typedef const struct OpaqueWKGeolocationManager* WKGeolocationManagerRef;
    116 typedef const struct OpaqueWKGeolocationPermissionRequest* WKGeolocationPermissionRequestRef;
    117 typedef const struct OpaqueWKGeolocationPosition* WKGeolocationPositionRef;
    118 typedef const struct OpaqueWKGrammarDetail* WKGrammarDetailRef;
    119 typedef const struct OpaqueWKHitTestResult* WKHitTestResultRef;
    120 typedef const struct OpaqueWKIconDatabase* WKIconDatabaseRef;
    121 typedef const struct OpaqueWKInspector* WKInspectorRef;
    122 typedef const struct OpaqueWKKeyValueStorageManager* WKKeyValueStorageManagerRef;
    123 typedef const struct OpaqueWKMediaCacheManager* WKMediaCacheManagerRef;
    124 typedef const struct OpaqueWKNavigationData* WKNavigationDataRef;
    125 typedef const struct OpaqueWKNetworkInfoManager* WKNetworkInfoManagerRef;
    126 typedef const struct OpaqueWKNetworkInfo* WKNetworkInfoRef;
    127 typedef const struct OpaqueWKNotification* WKNotificationRef;
    128 typedef const struct OpaqueWKNotificationManager* WKNotificationManagerRef;
    129 typedef const struct OpaqueWKNotificationPermissionRequest* WKNotificationPermissionRequestRef;
    130 typedef const struct OpaqueWKNotificationProvider* WKNotificationProviderRef;
    131 typedef const struct OpaqueWKOpenPanelParameters* WKOpenPanelParametersRef;
    132 typedef const struct OpaqueWKOpenPanelResultListener* WKOpenPanelResultListenerRef;
    133 typedef const struct OpaqueWKPage* WKPageRef;
    134 typedef const struct OpaqueWKPageGroup* WKPageGroupRef;
    135 typedef const struct OpaqueWKPluginSiteDataManager* WKPluginSiteDataManagerRef;
    136 typedef const struct OpaqueWKPreferences* WKPreferencesRef;
    137 typedef const struct OpaqueWKProtectionSpace* WKProtectionSpaceRef;
    138 typedef const struct OpaqueWKTextChecker* WKTextCheckerRef;
    139 typedef const struct OpaqueWKVibration* WKVibrationRef;
    140 typedef const struct OpaqueWKViewportAttributes* WKViewportAttributesRef;
    141 
    142 /* WebKit2 Bundle types */
    143 
    144 typedef const struct OpaqueWKBundle* WKBundleRef;
    145 typedef const struct OpaqueWKBundleBackForwardList* WKBundleBackForwardListRef;
    146 typedef const struct OpaqueWKBundleBackForwardListItem* WKBundleBackForwardListItemRef;
    147 typedef const struct OpaqueWKBundleDOMCSSStyleDeclaration* WKBundleCSSStyleDeclarationRef;
    148 typedef const struct OpaqueWKBundleDOMWindowExtension* WKBundleDOMWindowExtensionRef;
    149 typedef const struct OpaqueWKBundleFrame* WKBundleFrameRef;
    150 typedef const struct OpaqueWKBundleHitTestResult* WKBundleHitTestResultRef;
    151 typedef const struct OpaqueWKBundleInspector* WKBundleInspectorRef;
    152 typedef const struct OpaqueWKBundleNavigationAction* WKBundleNavigationActionRef;
    153 typedef const struct OpaqueWKBundleNodeHandle* WKBundleNodeHandleRef;
    154 typedef const struct OpaqueWKBundlePage* WKBundlePageRef;
    155 typedef const struct OpaqueWKBundlePageBanner* WKBundlePageBannerRef;
    156 typedef const struct OpaqueWKBundlePageGroup* WKBundlePageGroupRef;
    157 typedef const struct OpaqueWKBundlePageOverlay* WKBundlePageOverlayRef;
    158 typedef const struct OpaqueWKBundleRangeHandle* WKBundleRangeHandleRef;
    159 typedef const struct OpaqueWKBundleScriptWorld* WKBundleScriptWorldRef;
    160 
    161 #undef WK_EXPORT
    162 #if defined(WK_NO_EXPORT)
    163 #define WK_EXPORT
    164 #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
    165 #define WK_EXPORT __attribute__((visibility("default")))
    166 #elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE) || defined(__CC_ARM) || defined(__ARMCC__)
    167 #if BUILDING_WEBKIT
    168 #define WK_EXPORT __declspec(dllexport)
    169 #else
    170 #define WK_EXPORT __declspec(dllimport)
    171 #endif
    172 #else /* !defined(WK_NO_EXPORT) */
    173 #define WK_EXPORT
    174 #endif /* defined(WK_NO_EXPORT) */
    175 
    176 #if !defined(WK_INLINE)
    177 #if defined(__cplusplus)
    178 #define WK_INLINE static inline
    179 #elif defined(__GNUC__)
    180 #define WK_INLINE static __inline__
    181 #elif defined(__WIN32__)
    182 #define WK_INLINE static __inline
    183 #else
    184 #define WK_INLINE static   
    185 #endif
    186 #endif /* !defined(WK_INLINE) */
    187 
    188 #endif /* WKBase_h */
     35#endif /* WKUserContentInjectedFrames_h */

  • trunk/Source/WebKit2/Shared/API/c/WKUserScriptInjectionTime.h

    r155754 r155770  
    11/*
    2  * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
    3  * Portions Copyright (c) 2010 Motorola Mobility, Inc.  All rights reserved.
     2 * Copyright (C) 2012 Apple Inc. All rights reserved.
    43 *
    54 * Redistribution and use in source and binary forms, with or without
    … …  
    2524 */
    2625
    27 #ifndef WKBase_h
    28 #define WKBase_h
    29 
    30 #include <stdint.h>
    31 
    32 #if defined(BUILDING_GTK__)
    33 #include <WebKit2/WKBaseGtk.h>
    34 #endif
    35 
    36 #if defined(WTF_USE_SOUP)
    37 #include <WebKit2/WKBaseSoup.h>
    38 #endif
    39 
    40 #if defined(BUILDING_EFL__)
    41 #include <WebKit2/WKBaseEfl.h>
    42 #endif
    43 
    44 #if defined(__APPLE__) && !defined(BUILDING_QT__)
    45 #include <WebKit2/WKBaseMac.h>
    46 #endif
    47 
    48 /* WebKit2 shared types */
    49 
    50 typedef uint32_t WKTypeID;
    51 typedef const void* WKTypeRef;
    52 
    53 typedef const struct OpaqueWKArray* WKArrayRef;
    54 typedef struct OpaqueWKArray* WKMutableArrayRef;
    55 
    56 typedef const struct OpaqueWKDictionary* WKDictionaryRef;
    57 typedef struct OpaqueWKDictionary* WKMutableDictionaryRef;
    58 
    59 typedef const struct OpaqueWKBoolean* WKBooleanRef;
    60 typedef const struct OpaqueWKCertificateInfo* WKCertificateInfoRef;
    61 typedef const struct OpaqueWKConnection* WKConnectionRef;
    62 typedef const struct OpaqueWKContextMenuItem* WKContextMenuItemRef;
    63 typedef const struct OpaqueWKData* WKDataRef;
    64 typedef const struct OpaqueWKDouble* WKDoubleRef;
    65 typedef const struct OpaqueWKError* WKErrorRef;
    66 typedef const struct OpaqueWKGraphicsContext* WKGraphicsContextRef;
    67 typedef const struct OpaqueWKImage* WKImageRef;
    68 typedef const struct OpaqueWKPointRef* WKPointRef;
    69 typedef const struct OpaqueWKRectRef* WKRectRef;
    70 typedef const struct OpaqueWKRenderLayer* WKRenderLayerRef;
    71 typedef const struct OpaqueWKRenderObject* WKRenderObjectRef;
    72 typedef const struct OpaqueWKSecurityOrigin* WKSecurityOriginRef;
    73 typedef const struct OpaqueWKSerializedScriptValue* WKSerializedScriptValueRef;
    74 typedef const struct OpaqueWKSizeRef* WKSizeRef;
    75 typedef const struct OpaqueWKString* WKStringRef;
    76 typedef const struct OpaqueWKUInt64* WKUInt64Ref;
    77 typedef const struct OpaqueWKURL* WKURLRef;
    78 typedef const struct OpaqueWKURLRequest* WKURLRequestRef;
    79 typedef const struct OpaqueWKURLResponse* WKURLResponseRef;
    80 typedef const struct OpaqueWKUserContentURLPattern* WKUserContentURLPatternRef;
    81 typedef const struct OpaqueWKWebArchive* WKWebArchiveRef;
    82 typedef const struct OpaqueWKWebArchiveResource* WKWebArchiveResourceRef;
    83 
    84 enum WKUserContentInjectedFrames {
    85     kWKInjectInAllFrames,
    86     kWKInjectInTopFrameOnly
    87 };
    88 typedef enum WKUserContentInjectedFrames WKUserContentInjectedFrames;
     26#ifndef WKUserScriptInjectionTime_h
     27#define WKUserScriptInjectionTime_h
    8928
    9029enum WKUserScriptInjectionTime {
    … …  
    9433typedef enum WKUserScriptInjectionTime WKUserScriptInjectionTime;
    9534
    96 /* WebKit2 main API types */
    97 
    98 typedef const struct OpaqueWKApplicationCacheManager* WKApplicationCacheManagerRef;
    99 typedef const struct OpaqueWKAuthenticationChallenge* WKAuthenticationChallengeRef;
    100 typedef const struct OpaqueWKAuthenticationDecisionListener* WKAuthenticationDecisionListenerRef;
    101 typedef const struct OpaqueWKBackForwardList* WKBackForwardListRef;
    102 typedef const struct OpaqueWKBackForwardListItem* WKBackForwardListItemRef;
    103 typedef const struct OpaqueWKBatteryManager* WKBatteryManagerRef;
    104 typedef const struct OpaqueWKBatteryStatus* WKBatteryStatusRef;
    105 typedef const struct OpaqueWKResourceCacheManager* WKResourceCacheManagerRef;
    106 typedef const struct OpaqueWKColorPickerResultListener* WKColorPickerResultListenerRef;
    107 typedef const struct OpaqueWKContext* WKContextRef;
    108 typedef const struct OpaqueWKCookieManager* WKCookieManagerRef;
    109 typedef const struct OpaqueWKCredential* WKCredentialRef;
    110 typedef const struct OpaqueWKDatabaseManager* WKDatabaseManagerRef;
    111 typedef const struct OpaqueWKDownload* WKDownloadRef;
    112 typedef const struct OpaqueWKFormSubmissionListener* WKFormSubmissionListenerRef;
    113 typedef const struct OpaqueWKFrame* WKFrameRef;
    114 typedef const struct OpaqueWKFramePolicyListener* WKFramePolicyListenerRef;
    115 typedef const struct OpaqueWKGeolocationManager* WKGeolocationManagerRef;
    116 typedef const struct OpaqueWKGeolocationPermissionRequest* WKGeolocationPermissionRequestRef;
    117 typedef const struct OpaqueWKGeolocationPosition* WKGeolocationPositionRef;
    118 typedef const struct OpaqueWKGrammarDetail* WKGrammarDetailRef;
    119 typedef const struct OpaqueWKHitTestResult* WKHitTestResultRef;
    120 typedef const struct OpaqueWKIconDatabase* WKIconDatabaseRef;
    121 typedef const struct OpaqueWKInspector* WKInspectorRef;
    122 typedef const struct OpaqueWKKeyValueStorageManager* WKKeyValueStorageManagerRef;
    123 typedef const struct OpaqueWKMediaCacheManager* WKMediaCacheManagerRef;
    124 typedef const struct OpaqueWKNavigationData* WKNavigationDataRef;
    125 typedef const struct OpaqueWKNetworkInfoManager* WKNetworkInfoManagerRef;
    126 typedef const struct OpaqueWKNetworkInfo* WKNetworkInfoRef;
    127 typedef const struct OpaqueWKNotification* WKNotificationRef;
    128 typedef const struct OpaqueWKNotificationManager* WKNotificationManagerRef;
    129 typedef const struct OpaqueWKNotificationPermissionRequest* WKNotificationPermissionRequestRef;
    130 typedef const struct OpaqueWKNotificationProvider* WKNotificationProviderRef;
    131 typedef const struct OpaqueWKOpenPanelParameters* WKOpenPanelParametersRef;
    132 typedef const struct OpaqueWKOpenPanelResultListener* WKOpenPanelResultListenerRef;
    133 typedef const struct OpaqueWKPage* WKPageRef;
    134 typedef const struct OpaqueWKPageGroup* WKPageGroupRef;
    135 typedef const struct OpaqueWKPluginSiteDataManager* WKPluginSiteDataManagerRef;
    136 typedef const struct OpaqueWKPreferences* WKPreferencesRef;
    137 typedef const struct OpaqueWKProtectionSpace* WKProtectionSpaceRef;
    138 typedef const struct OpaqueWKTextChecker* WKTextCheckerRef;
    139 typedef const struct OpaqueWKVibration* WKVibrationRef;
    140 typedef const struct OpaqueWKViewportAttributes* WKViewportAttributesRef;
    141 
    142 /* WebKit2 Bundle types */
    143 
    144 typedef const struct OpaqueWKBundle* WKBundleRef;
    145 typedef const struct OpaqueWKBundleBackForwardList* WKBundleBackForwardListRef;
    146 typedef const struct OpaqueWKBundleBackForwardListItem* WKBundleBackForwardListItemRef;
    147 typedef const struct OpaqueWKBundleDOMCSSStyleDeclaration* WKBundleCSSStyleDeclarationRef;
    148 typedef const struct OpaqueWKBundleDOMWindowExtension* WKBundleDOMWindowExtensionRef;
    149 typedef const struct OpaqueWKBundleFrame* WKBundleFrameRef;
    150 typedef const struct OpaqueWKBundleHitTestResult* WKBundleHitTestResultRef;
    151 typedef const struct OpaqueWKBundleInspector* WKBundleInspectorRef;
    152 typedef const struct OpaqueWKBundleNavigationAction* WKBundleNavigationActionRef;
    153 typedef const struct OpaqueWKBundleNodeHandle* WKBundleNodeHandleRef;
    154 typedef const struct OpaqueWKBundlePage* WKBundlePageRef;
    155 typedef const struct OpaqueWKBundlePageBanner* WKBundlePageBannerRef;
    156 typedef const struct OpaqueWKBundlePageGroup* WKBundlePageGroupRef;
    157 typedef const struct OpaqueWKBundlePageOverlay* WKBundlePageOverlayRef;
    158 typedef const struct OpaqueWKBundleRangeHandle* WKBundleRangeHandleRef;
    159 typedef const struct OpaqueWKBundleScriptWorld* WKBundleScriptWorldRef;
    160 
    161 #undef WK_EXPORT
    162 #if defined(WK_NO_EXPORT)
    163 #define WK_EXPORT
    164 #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
    165 #define WK_EXPORT __attribute__((visibility("default")))
    166 #elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE) || defined(__CC_ARM) || defined(__ARMCC__)
    167 #if BUILDING_WEBKIT
    168 #define WK_EXPORT __declspec(dllexport)
    169 #else
    170 #define WK_EXPORT __declspec(dllimport)
    171 #endif
    172 #else /* !defined(WK_NO_EXPORT) */
    173 #define WK_EXPORT
    174 #endif /* defined(WK_NO_EXPORT) */
    175 
    176 #if !defined(WK_INLINE)
    177 #if defined(__cplusplus)
    178 #define WK_INLINE static inline
    179 #elif defined(__GNUC__)
    180 #define WK_INLINE static __inline__
    181 #elif defined(__WIN32__)
    182 #define WK_INLINE static __inline
    183 #else
    184 #define WK_INLINE static   
    185 #endif
    186 #endif /* !defined(WK_INLINE) */
    187 
    188 #endif /* WKBase_h */
     35#endif /* WKUserScriptInjectionTime_h */

  • trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h

    r131544 r155770  
    2828
    2929#include <WebKit2/WKBase.h>
     30#include <WebKit2/WKUserContentInjectedFrames.h>
     31#include <WebKit2/WKUserScriptInjectionTime.h>
    3032
    3133#ifdef __cplusplus

  • trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h

    r150277 r155770  
    2525
    2626#import <Foundation/Foundation.h>
    27 #import <WebKit2/WKBase.h>
     27#import <WebKit2/WKDeclarationSpecifiers.h>
    2828
    2929@class WKBrowsingContextControllerData;

  • trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextControllerPrivate.h

    r144777 r155770  
    2525
    2626#import <WebKit2/WKBrowsingContextController.h>
     27#import <WebKit2/WKBase.h>
    2728
    2829enum {

  • trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.h

    r131544 r155770  
    2525
    2626#import <Foundation/Foundation.h>
    27 #import <WebKit2/WKBase.h>
     27#import <WebKit2/WKDeclarationSpecifiers.h>
     28#import <WebKit2/WKUserScriptInjectionTime.h>
    2829
    2930@class WKBrowsingContextGroupData;

  • trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroupPrivate.h

    r144777 r155770  
    2525
    2626#import <WebKit2/WKBrowsingContextGroup.h>
     27#import <WebKit2/WKBase.h>
    2728
    2829@interface WKBrowsingContextGroup (Private)

  • trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextLoadDelegate.h

    r98399 r155770  
    2525
    2626#import <Foundation/Foundation.h>
    27 #import <WebKit2/WKBase.h>
    2827
    2928@class WKBrowsingContextController;

  • trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.h

    r133558 r155770  
    2525
    2626#import <Foundation/Foundation.h>
    27 #import <WebKit2/WKBase.h>
     27#import <WebKit2/WKDeclarationSpecifiers.h>
    2828
    2929@class WKConnection, WKConnectionData;

  • trunk/Source/WebKit2/UIProcess/API/mac/WKConnectionInternal.h

    r102633 r155770  
    2525
    2626#import <WebKit2/WKConnection.h>
     27#import <WebKit2/WKBase.h>
    2728
    2829@interface WKConnection (Internal)

  • trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroup.h

    r148376 r155770  
    2525
    2626#import <Foundation/Foundation.h>
    27 #import <WebKit2/WKBase.h>
     27#import <WebKit2/WKDeclarationSpecifiers.h>
    2828
    2929@class WKProcessGroup, WKProcessGroupData, WKConnection;

  • trunk/Source/WebKit2/UIProcess/API/mac/WKProcessGroupPrivate.h

    r144777 r155770  
    2525
    2626#import <WebKit2/WKProcessGroup.h>
     27#import <WebKit2/WKBase.h>
    2728
    2829@interface WKProcessGroup (Private)

  • trunk/Source/WebKit2/UIProcess/API/mac/WKView.h

    r128101 r155770  
    2525
    2626#import <Cocoa/Cocoa.h>
    27 #import <WebKit2/WKBase.h>
     27#import <WebKit2/WKDeclarationSpecifiers.h>
    2828
    2929@class WKBrowsingContextController;

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

    r154256 r155770  
    394394                37608822150414F700FC82C7 /* WKRenderObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37608820150414F700FC82C7 /* WKRenderObject.cpp */; };
    395395                37608823150414F700FC82C7 /* WKRenderObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 37608821150414F700FC82C7 /* WKRenderObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
     396                377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */; settings = {ATTRIBUTES = (Public, ); }; };
     397                377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */; settings = {ATTRIBUTES = (Public, ); }; };
     398                377EAD4917E2C77B002D193D /* WKUserScriptInjectionTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */; settings = {ATTRIBUTES = (Public, ); }; };
    396399                3788A05C14743C90006319E5 /* WKBrowsingContextControllerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3788A05B14743C90006319E5 /* WKBrowsingContextControllerPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    397400                37948403150C350600E52CE9 /* WebRenderLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37948401150C350600E52CE9 /* WebRenderLayer.cpp */; };
    … …  
    10051008                BCD598AD112B7FDF00EC8C23 /* WebPreferencesStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */; };
    10061009                BCDB86C11200FB97007254BE /* WebURL.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDB86C01200FB97007254BE /* WebURL.h */; };
    1007                 BCDDB317124EBD130048D13C /* WKBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB316124EBD130048D13C /* WKBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
     1010                BCDDB317124EBD130048D13C /* WKBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB316124EBD130048D13C /* WKBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
    10081011                BCDDB32B124EC2AB0048D13C /* WKSharedAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32A124EC2AB0048D13C /* WKSharedAPICast.h */; };
    10091012                BCDDB32D124EC2E10048D13C /* WKAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32C124EC2E10048D13C /* WKAPICast.h */; };
    … …  
    18141817                37608820150414F700FC82C7 /* WKRenderObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKRenderObject.cpp; sourceTree = "<group>"; };
    18151818                37608821150414F700FC82C7 /* WKRenderObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRenderObject.h; sourceTree = "<group>"; };
     1819                377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDeclarationSpecifiers.h; sourceTree = "<group>"; };
     1820                377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentInjectedFrames.h; sourceTree = "<group>"; };
     1821                377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserScriptInjectionTime.h; sourceTree = "<group>"; };
    18161822                3788A05B14743C90006319E5 /* WKBrowsingContextControllerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextControllerPrivate.h; sourceTree = "<group>"; };
    18171823                37948401150C350600E52CE9 /* WebRenderLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebRenderLayer.cpp; sourceTree = "<group>"; };
    … …  
    47914797                                BC4075DB124FF0270068F20A /* WKData.cpp */,
    47924798                                BC4075DC124FF0270068F20A /* WKData.h */,
     4799                                377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */,
    47934800                                BC4075DD124FF0270068F20A /* WKDictionary.cpp */,
    47944801                                BC4075DE124FF0270068F20A /* WKDictionary.h */,
    … …  
    48354842                                BC4075F1124FF0270068F20A /* WKURLResponse.cpp */,
    48364843                                BC4075F2124FF0270068F20A /* WKURLResponse.h */,
     4844                                377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */,
    48374845                                F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */,
    48384846                                F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */,
     4847                                377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */,
    48394848                        );
    48404849                        name = C;
    … …  
    53125321                                BC2D021712AC41CB00E732A3 /* SameDocumentNavigationType.h in Headers */,
    53135322                                1AAB4A8D1296F0A20023952F /* SandboxExtension.h in Headers */,
     5323                                377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */,
    53145324                                E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */,
    53155325                                51D130541382EAC000351EDD /* SecItemRequestData.h in Headers */,
    … …  
    53555365                                C5E1AFED16B21017006CC1F2 /* WebArchive.h in Headers */,
    53565366                                C5E1AFEF16B21029006CC1F2 /* WebArchiveResource.h in Headers */,
     5367                                377EAD4917E2C77B002D193D /* WKUserScriptInjectionTime.h in Headers */,
    53575368                                BC72BA1E11E64907001EB4EA /* WebBackForwardList.h in Headers */,
    53585369                                518D2CAE12D5153B003BB93B /* WebBackForwardListItem.h in Headers */,
    … …  
    56345645                                BC40761A124FF0370068F20A /* WKStringCF.h in Headers */,
    56355646                                BC9099801256A98200083756 /* WKStringPrivate.h in Headers */,
     5647                                377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */,
    56365648                                1A4A9AA812B7E796008FE984 /* WKTextInputWindowController.h in Headers */,
    56375649                                BC407608124FF0270068F20A /* WKType.h in Headers */,

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h

    r154144 r155770  
    3232#include <stdbool.h>
    3333#endif
     34
     35#include <WebKit2/WKUserContentInjectedFrames.h>
     36#include <WebKit2/WKUserScriptInjectionTime.h>
    3437
    3538#ifdef __cplusplus

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h

    r132282 r155770  
    2727
    2828#import <Foundation/Foundation.h>
    29 #import <WebKit2/WKBase.h>
     29#import <WebKit2/WKDeclarationSpecifiers.h>
    3030
    3131@class WKDOMDocument;

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNodePrivate.h

    r146154 r155770  
    2727
    2828#import <WebKit2/WKDOMNode.h>
     29#import <WebKit2/WKBase.h>
    2930
    3031@interface WKDOMNode (WKPrivate)

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.h

    r132282 r155770  
    2727
    2828#import <Foundation/Foundation.h>
    29 #import <WebKit2/WKBase.h>
     29#import <WebKit2/WKDeclarationSpecifiers.h>
    3030
    3131@class WKDOMNode, WKDOMDocument;

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h

    r143111 r155770  
    2727
    2828#import <WebKit2/WKDOMRange.h>
     29#import <WebKit2/WKBase.h>
    2930
    3031@interface WKDOMRange (WKPrivate)

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.h

    r131069 r155770  
    2727
    2828#import <Foundation/Foundation.h>
    29 #import <WebKit2/WKBase.h>
     29#import <WebKit2/WKDeclarationSpecifiers.h>
    3030
    3131@class WKDOMRange;

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h

    r145335 r155770  
    2727
    2828#import <Foundation/Foundation.h>
    29 #import <WebKit2/WKBase.h>
     29#import <WebKit2/WKDeclarationSpecifiers.h>
    3030
    3131@class WKDOMDocument;

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerInternal.h

    r131264 r155770  
    2727
    2828#import "WKWebProcessPlugInBrowserContextController.h"
     29#import "WKBase.h"
    2930
    3031@interface WKWebProcessPlugInBrowserContextController (Internal)
Note: See TracChangeset for help on using the changeset viewer.