Changeset 159788 in webkit


Ignore:
Timestamp:
Nov 26, 2013 12:07:48 PM (10 years ago)
Author:
mitz@apple.com
Message:

Some WebKit2 headers are not self-contained
https://bugs.webkit.org/show_bug.cgi?id=124884

Reviewed by Anders Carlsson.

  • Shared/API/Cocoa/WKRemoteObjectInterface.h: Added import.
  • Shared/API/Cocoa/WKRemoteObjectRegistry.h: Ditto.
  • Shared/API/c/WKContextMenuItemTypes.h: Added include.
  • Shared/API/c/WKFindOptions.h: Ditto.
  • Shared/API/c/WKMutableArray.h: Ditto.
  • Shared/API/c/WKPageLoadTypes.h: Ditto.
  • Shared/API/c/WKPageVisibilityTypes.h: Ditto.
  • Shared/API/c/WKPluginInformation.cpp:

(WKPluginInformationBundleIdentifierKey): Made this API function always be defined. When
the Netscape plug-in API is not enabled, it returns 0.
(WKPluginInformationBundleVersionKey): Ditto.
(WKPluginInformationBundleShortVersionKey): Ditto.
(WKPluginInformationPathKey): Ditto.
(WKPluginInformationDisplayNameKey): Ditto.
(WKPluginInformationDefaultLoadPolicyKey): Ditto.
(WKPluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey): Ditto.
(WKPluginInformationHasSandboxProfileKey): Ditto.
(WKPluginInformationFrameURLKey): Ditto.
(WKPluginInformationMIMETypeKey): Ditto.
(WKPluginInformationPageURLKey): Ditto.
(WKPluginInformationPluginspageAttributeURLKey): Ditto.
(WKPluginInformationPluginURLKey): Ditto.
(WKPlugInInformationReplacementObscuredKey): Ditto.

  • Shared/API/c/WKString.h: Added include.
  • UIProcess/API/C/WKCredentialTypes.h: Ditto.
  • UIProcess/API/C/WKPageContextMenuClient.h: Ditto.
  • UIProcess/API/C/WKPageLoaderClient.h: Added includes.
  • UIProcess/API/C/WKPagePolicyClient.h: Ditto.
  • UIProcess/API/C/WKPageUIClient.h: Ditto.
  • UIProcess/API/C/WKPluginSiteDataManager.cpp:

(WKPluginSiteDataManagerGetTypeID): Fixed the !ENABLE(NETSCAPE_PLUGIN_API) build.

  • UIProcess/API/C/mac/WKContextPrivateMac.h: Removed use of ENABLE() from this private

header.

  • UIProcess/API/C/mac/WKContextPrivateMac.mm:

(WKContextCopyPlugInInfoForBundleIdentifier): Made this API function always be defined.
When the Netscape plug-in API is not enabled, it returns 0.
(WKContextGetInfoForInstalledPlugIns): Made this API function always be defined.

  • UIProcess/API/C/mac/WKInspectorPrivateMac.h: Added imports.
  • UIProcess/API/C/mac/WKPagePrivateMac.h: Added include.
  • UIProcess/API/Cocoa/WKBackForwardListItem.h: Added import.
  • UIProcess/API/Cocoa/WKNavigationData.h: Ditto.
  • UIProcess/API/cpp/WKRetainPtr.h: Replaced use of WARN_UNUSED_RETURN in this private header

with an equivalent macro defined in the header.

  • WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h: Added include.
  • WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp:

(WKBundleInspectorGetTypeID): Made this API function always be defined. When the Inspector
is not enabled, it returns the Null type.
(WKBundleInspectorShow): Made this API function always be defined.
(WKBundleInspectorClose): Ditto.
(WKBundleInspectorEvaluateScriptForTest): Ditto.
(WKBundleInspectorSetPageProfilingEnabled): Ditto.

  • WebProcess/InjectedBundle/API/c/WKBundleInspector.h: Removed use of ENABLE() from this

private header.

  • WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h: Added includes.
  • WebProcess/InjectedBundle/API/c/WKBundlePrivate.h: Added include.
  • WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm:

(-[WKNPAPIPlugInContainer openPlugInPreferencePane]): Fixed the !ENABLE(NETSCAPE_PLUGIN_API)
build.

  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::createJavaAppletWidget): Ditto.

  • WebProcess/WebPage/mac/WebInspectorMac.mm: Fixed the !ENABLE(INSPECTOR) build.
Location:
trunk/Source/WebKit2
Files:
31 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r159775 r159788  
     12013-11-26  Dan Bernstein  <mitz@apple.com>
     2
     3        Some WebKit2 headers are not self-contained
     4        https://bugs.webkit.org/show_bug.cgi?id=124884
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * Shared/API/Cocoa/WKRemoteObjectInterface.h: Added import.
     9        * Shared/API/Cocoa/WKRemoteObjectRegistry.h: Ditto.
     10        * Shared/API/c/WKContextMenuItemTypes.h: Added include.
     11        * Shared/API/c/WKFindOptions.h: Ditto.
     12        * Shared/API/c/WKMutableArray.h: Ditto.
     13        * Shared/API/c/WKPageLoadTypes.h: Ditto.
     14        * Shared/API/c/WKPageVisibilityTypes.h: Ditto.
     15
     16        * Shared/API/c/WKPluginInformation.cpp:
     17        (WKPluginInformationBundleIdentifierKey): Made this API function always be defined. When
     18        the Netscape plug-in API is not enabled, it returns 0.
     19        (WKPluginInformationBundleVersionKey): Ditto.
     20        (WKPluginInformationBundleShortVersionKey): Ditto.
     21        (WKPluginInformationPathKey): Ditto.
     22        (WKPluginInformationDisplayNameKey): Ditto.
     23        (WKPluginInformationDefaultLoadPolicyKey): Ditto.
     24        (WKPluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey): Ditto.
     25        (WKPluginInformationHasSandboxProfileKey): Ditto.
     26        (WKPluginInformationFrameURLKey): Ditto.
     27        (WKPluginInformationMIMETypeKey): Ditto.
     28        (WKPluginInformationPageURLKey): Ditto.
     29        (WKPluginInformationPluginspageAttributeURLKey): Ditto.
     30        (WKPluginInformationPluginURLKey): Ditto.
     31        (WKPlugInInformationReplacementObscuredKey): Ditto.
     32
     33        * Shared/API/c/WKString.h: Added include.
     34        * UIProcess/API/C/WKCredentialTypes.h: Ditto.
     35        * UIProcess/API/C/WKPageContextMenuClient.h: Ditto.
     36        * UIProcess/API/C/WKPageLoaderClient.h: Added includes.
     37        * UIProcess/API/C/WKPagePolicyClient.h: Ditto.
     38        * UIProcess/API/C/WKPageUIClient.h: Ditto.
     39
     40        * UIProcess/API/C/WKPluginSiteDataManager.cpp:
     41        (WKPluginSiteDataManagerGetTypeID): Fixed the !ENABLE(NETSCAPE_PLUGIN_API) build.
     42
     43        * UIProcess/API/C/mac/WKContextPrivateMac.h: Removed use of ENABLE() from this private
     44        header.
     45        * UIProcess/API/C/mac/WKContextPrivateMac.mm:
     46        (WKContextCopyPlugInInfoForBundleIdentifier): Made this API function always be defined.
     47        When the Netscape plug-in API is not enabled, it returns 0.
     48        (WKContextGetInfoForInstalledPlugIns): Made this API function always be defined.
     49
     50        * UIProcess/API/C/mac/WKInspectorPrivateMac.h: Added imports.
     51        * UIProcess/API/C/mac/WKPagePrivateMac.h: Added include.
     52        * UIProcess/API/Cocoa/WKBackForwardListItem.h: Added import.
     53        * UIProcess/API/Cocoa/WKNavigationData.h: Ditto.
     54        * UIProcess/API/cpp/WKRetainPtr.h: Replaced use of WARN_UNUSED_RETURN in this private header
     55        with an equivalent macro defined in the header.
     56
     57        * WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h: Added include.
     58        * WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp:
     59        (WKBundleInspectorGetTypeID): Made this API function always be defined. When the Inspector
     60        is not enabled, it returns the Null type.
     61        (WKBundleInspectorShow): Made this API function always be defined.
     62        (WKBundleInspectorClose): Ditto.
     63        (WKBundleInspectorEvaluateScriptForTest): Ditto.
     64        (WKBundleInspectorSetPageProfilingEnabled): Ditto.
     65        * WebProcess/InjectedBundle/API/c/WKBundleInspector.h: Removed use of ENABLE() from this
     66        private header.
     67
     68        * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h: Added includes.
     69        * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h: Added include.
     70
     71        * WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm:
     72        (-[WKNPAPIPlugInContainer openPlugInPreferencePane]): Fixed the !ENABLE(NETSCAPE_PLUGIN_API)
     73        build.
     74
     75        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     76        (WebKit::WebFrameLoaderClient::createJavaAppletWidget): Ditto.
     77
     78        * WebProcess/WebPage/mac/WebInspectorMac.mm: Fixed the !ENABLE(INSPECTOR) build.
     79
    1802013-11-25  Dan Bernstein  <mitz@apple.com>
    281
  • trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.h

    r158316 r159788  
    2828#if WK_API_ENABLED
    2929
     30#import <Foundation/Foundation.h>
     31
    3032WK_API_CLASS
    3133@interface WKRemoteObjectInterface : NSObject
  • trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.h

    r158316 r159788  
    2828#if WK_API_ENABLED
    2929
     30#import <Foundation/Foundation.h>
     31
    3032@class WKRemoteObjectInterface;
    3133
  • trunk/Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h

    r151656 r159788  
    2626#ifndef WKContextMenuItemTypes_h
    2727#define WKContextMenuItemTypes_h
     28
     29#include <stdint.h>
    2830
    2931#ifdef __cplusplus
  • trunk/Source/WebKit2/Shared/API/c/WKFindOptions.h

    r151607 r159788  
    2727#define WKFindOptions_h
    2828
     29#include <stdint.h>
     30
    2931#ifdef __cplusplus
    3032extern "C" {
  • trunk/Source/WebKit2/Shared/API/c/WKMutableArray.h

    r159199 r159788  
    2828
    2929#include <WebKit2/WKBase.h>
     30#include <stddef.h>
    3031
    3132#ifndef __cplusplus
  • trunk/Source/WebKit2/Shared/API/c/WKPageLoadTypes.h

    r149317 r159788  
    2626#ifndef WKPageLoadTypes_h
    2727#define WKPageLoadTypes_h
     28
     29#include <stdint.h>
    2830
    2931#ifdef __cplusplus
  • trunk/Source/WebKit2/Shared/API/c/WKPageVisibilityTypes.h

    r150695 r159788  
    2727#define WKPageVisibilityTypes_h
    2828
     29#include <stdint.h>
     30
    2931#ifdef __cplusplus
    3032extern "C" {
  • trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp

    r159724 r159788  
    2727#include "WKPluginInformation.h"
    2828
    29 #if ENABLE(NETSCAPE_PLUGIN_API)
    30 
    3129#include "PluginInformation.h"
    3230#include "WKSharedAPICast.h"
     
    3735WKStringRef WKPluginInformationBundleIdentifierKey()
    3836{
     37#if ENABLE(NETSCAPE_PLUGIN_API)
    3938    static WebString* key = WebString::create(pluginInformationBundleIdentifierKey()).leakRef();
    4039    return toAPI(key);
     40#else
     41    return 0;
     42#endif
    4143}
    4244
    4345WKStringRef WKPluginInformationBundleVersionKey()
    4446{
     47#if ENABLE(NETSCAPE_PLUGIN_API)
    4548    static WebString* key = WebString::create(pluginInformationBundleVersionKey()).leakRef();
    4649    return toAPI(key);
     50#else
     51    return 0;
     52#endif
    4753}
    4854
    4955WKStringRef WKPluginInformationBundleShortVersionKey()
    5056{
     57#if ENABLE(NETSCAPE_PLUGIN_API)
    5158    static WebString* key = WebString::create(pluginInformationBundleShortVersionKey()).leakRef();
    5259    return toAPI(key);
     60#else
     61    return 0;
     62#endif
    5363}
    5464
    5565WKStringRef WKPluginInformationPathKey()
    5666{
     67#if ENABLE(NETSCAPE_PLUGIN_API)
    5768    static WebString* key = WebString::create(pluginInformationPathKey()).leakRef();
    5869    return toAPI(key);
     70#else
     71    return 0;
     72#endif
    5973}
    6074
    6175WKStringRef WKPluginInformationDisplayNameKey()
    6276{
     77#if ENABLE(NETSCAPE_PLUGIN_API)
    6378    static WebString* key = WebString::create(pluginInformationDisplayNameKey()).leakRef();
    6479    return toAPI(key);
     80#else
     81    return 0;
     82#endif
    6583}
    6684
    6785WKStringRef WKPluginInformationDefaultLoadPolicyKey()
    6886{
     87#if ENABLE(NETSCAPE_PLUGIN_API)
    6988    static WebString* key = WebString::create(pluginInformationDefaultLoadPolicyKey()).leakRef();
    7089    return toAPI(key);
     90#else
     91    return 0;
     92#endif
    7193}
    7294
    7395WKStringRef WKPluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey()
    7496{
     97#if ENABLE(NETSCAPE_PLUGIN_API)
    7598    static WebString* key = WebString::create(pluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey()).leakRef();
    7699    return toAPI(key);
     100#else
     101    return 0;
     102#endif
    77103}
    78104
    79105WKStringRef WKPluginInformationHasSandboxProfileKey()
    80106{
     107#if ENABLE(NETSCAPE_PLUGIN_API)
    81108    static WebString* key = WebString::create(pluginInformationHasSandboxProfileKey()).leakRef();
    82109    return toAPI(key);
     110#else
     111    return 0;
     112#endif
    83113}
    84114
    85115WKStringRef WKPluginInformationFrameURLKey()
    86116{
     117#if ENABLE(NETSCAPE_PLUGIN_API)
    87118    static WebString* key = WebString::create(pluginInformationFrameURLKey()).leakRef();
    88119    return toAPI(key);
     120#else
     121    return 0;
     122#endif
    89123}
    90124
    91125WKStringRef WKPluginInformationMIMETypeKey()
    92126{
     127#if ENABLE(NETSCAPE_PLUGIN_API)
    93128    static WebString* key = WebString::create(pluginInformationMIMETypeKey()).leakRef();
    94129    return toAPI(key);
     130#else
     131    return 0;
     132#endif
    95133}
    96134
    97135WKStringRef WKPluginInformationPageURLKey()
    98136{
     137#if ENABLE(NETSCAPE_PLUGIN_API)
    99138    static WebString* key = WebString::create(pluginInformationPageURLKey()).leakRef();
    100139    return toAPI(key);
     140#else
     141    return 0;
     142#endif
    101143}
    102144
    103145WKStringRef WKPluginInformationPluginspageAttributeURLKey()
    104146{
     147#if ENABLE(NETSCAPE_PLUGIN_API)
    105148    static WebString* key = WebString::create(pluginInformationPluginspageAttributeURLKey()).leakRef();
    106149    return toAPI(key);
     150#else
     151    return 0;
     152#endif
    107153}
    108154
    109155WKStringRef WKPluginInformationPluginURLKey()
    110156{
     157#if ENABLE(NETSCAPE_PLUGIN_API)
    111158    static WebString* key = WebString::create(pluginInformationPluginURLKey()).leakRef();
    112159    return toAPI(key);
     160#else
     161    return 0;
     162#endif
    113163}
    114164
    115165WKStringRef WKPlugInInformationReplacementObscuredKey()
    116166{
     167#if ENABLE(NETSCAPE_PLUGIN_API)
    117168    static WebString* key = WebString::create(plugInInformationReplacementObscuredKey()).leakRef();
    118169    return toAPI(key);
     170#else
     171    return 0;
     172#endif
    119173}
    120 #endif // ENABLE(NETSCAPE_PLUGIN_API)
  • trunk/Source/WebKit2/Shared/API/c/WKString.h

    r100086 r159788  
    2828
    2929#include <WebKit2/WKBase.h>
     30#include <stddef.h>
    3031
    3132#ifndef __cplusplus
  • trunk/Source/WebKit2/UIProcess/API/C/WKCredentialTypes.h

    r95901 r159788  
    2727#define WKCredentialTypes_h
    2828
     29#include <stdint.h>
     30
    2931#ifdef __cplusplus
    3032extern "C" {
  • trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h

    r159715 r159788  
    2828
    2929#include <WebKit2/WKBase.h>
     30#include <WebKit2/WKGeometry.h>
    3031
    3132#ifdef __cplusplus
  • trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h

    r159715 r159788  
    2828
    2929#include <WebKit2/WKBase.h>
     30#include <WebKit2/WKError.h>
     31#include <WebKit2/WKPageLoadTypes.h>
    3032
    3133#ifdef __cplusplus
  • trunk/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h

    r159715 r159788  
    2828
    2929#include <WebKit2/WKBase.h>
     30#include <WebKit2/WKEvent.h>
     31#include <WebKit2/WKPageLoadTypes.h>
    3032
    3133#ifdef __cplusplus
  • trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h

    r159715 r159788  
    2828
    2929#include <WebKit2/WKBase.h>
     30#include <WebKit2/WKEvent.h>
     31#include <WebKit2/WKGeometry.h>
     32#include <WebKit2/WKNativeEvent.h>
    3033
    3134#ifdef __cplusplus
  • trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp

    r159204 r159788  
    4242    return toAPI(WebPluginSiteDataManager::APIType);
    4343#else
    44     return API::Object::Type::Null;
     44    return toAPI(API::Object::Type::Null);
    4545#endif
    4646}
  • trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h

    r159724 r159788  
    3838WK_EXPORT bool WKContextIsPlugInUpdateAvailable(WKContextRef context, WKStringRef plugInBundleIdentifier);
    3939
    40 #if ENABLE(NETSCAPE_PLUGIN_API)
    41 
    4240WK_EXPORT WKDictionaryRef WKContextCopyPlugInInfoForBundleIdentifier(WKContextRef context, WKStringRef plugInBundleIdentifier);
    4341
     
    6765WK_EXPORT WKStringRef WKPlugInInfoIsSandboxedKey();
    6866
    69 #endif // ENABLE(NETSCAPE_PLUGIN_API)
    70 
    7167#ifdef __cplusplus
    7268}
  • trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm

    r159724 r159788  
    6464}
    6565
    66 #if ENABLE(NETSCAPE_PLUGIN_API)
    67 
    6866WKDictionaryRef WKContextCopyPlugInInfoForBundleIdentifier(WKContextRef contextRef, WKStringRef plugInBundleIdentifierRef)
    6967{
     68#if ENABLE(NETSCAPE_PLUGIN_API)
    7069    PluginModuleInfo plugin = toImpl(contextRef)->pluginInfoStore().findPluginWithBundleIdentifier(toWTFString(plugInBundleIdentifierRef));
    7170    if (plugin.path.isNull())
     
    7473    RefPtr<ImmutableDictionary> dictionary = createPluginInformationDictionary(plugin);
    7574    return toAPI(dictionary.release().leakRef());
     75#else
     76    return 0;
     77#endif
    7678}
    7779
    7880void WKContextGetInfoForInstalledPlugIns(WKContextRef contextRef, WKContextGetInfoForInstalledPlugInsBlock block)
    7981{
     82#if ENABLE(NETSCAPE_PLUGIN_API)
    8083    Vector<PluginModuleInfo> plugins = toImpl(contextRef)->pluginInfoStore().plugins();
    8184
     
    9497        toImpl(contextRef)->deref();
    9598    });
     99#endif
    96100}
    97101
     
    133137    return WKPluginInformationHasSandboxProfileKey();
    134138}
    135 
    136 #endif // ENABLE(NETSCAPE_PLUGIN_API)
  • trunk/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h

    r109819 r159788  
    2424 */
    2525
    26 #ifndef WKInspectorPrivateMac_h
    27 #define WKInspectorPrivateMac_h
     26#import <AppKit/NSWindow.h>
     27#import <WebKit2/WKDeclarationSpecifiers.h>
     28#import <WebKit2/WKInspector.h>
    2829
    2930#ifdef __cplusplus
     
    4647}
    4748#endif
    48 
    49 #endif // WKInspectorPrivateMac_h
  • trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h

    r153096 r159788  
    2828
    2929#include <WebKit2/WKBase.h>
     30#include <sys/types.h>
    3031
    3132#ifdef __cplusplus
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h

    r157951 r159788  
    3232#if WK_API_ENABLED
    3333
     34#import <Foundation/Foundation.h>
     35
    3436WK_API_CLASS
    3537@interface WKBackForwardListItem : NSObject
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.h

    r158779 r159788  
    3232#if WK_API_ENABLED
    3333
     34#import <Foundation/Foundation.h>
     35
    3436WK_API_CLASS
    3537@interface WKNavigationData : NSObject
  • trunk/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h

    r156967 r159788  
    230230}
    231231
    232 template<typename T> inline WKRetainPtr<T> adoptWK(T) WARN_UNUSED_RETURN;
     232#if defined(__GNUC__) && !(defined(__CC_ARM) || defined(__ARMCC__))
     233#define WK_WARN_UNUSED_RETURN __attribute__((warn_unused_result))
     234#else
     235#define WK_WARN_UNUSED_RETURN
     236#endif
     237
     238template<typename T> inline WKRetainPtr<T> adoptWK(T) WK_WARN_UNUSED_RETURN;
     239
     240#undef WK_WARN_UNUSED_RETURN
    233241
    234242template<typename T> inline WKRetainPtr<T> adoptWK(T o)
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h

    r148938 r159788  
    2929#include <JavaScriptCore/JavaScript.h>
    3030#include <WebKit2/WKBase.h>
     31#include <WebKit2/WKGeometry.h>
    3132
    3233#ifndef __cplusplus
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp

    r129743 r159788  
    2727#include "WKBundleInspector.h"
    2828
    29 #if ENABLE(INSPECTOR)
    30 
    3129#include "WKAPICast.h"
    3230#include "WKBundleAPICast.h"
     
    3836WKTypeID WKBundleInspectorGetTypeID()
    3937{
     38#if ENABLE(INSPECTOR)
    4039    return toAPI(WebInspector::APIType);
     40#else
     41    return toAPI(API::Object::Type::Null);
     42#endif
    4143}
    4244
    4345void WKBundleInspectorShow(WKBundleInspectorRef inspectorRef)
    4446{
    45     return toImpl(inspectorRef)->show();
     47#if ENABLE(INSPECTOR)
     48    toImpl(inspectorRef)->show();
     49#endif
    4650}
    4751
    4852void WKBundleInspectorClose(WKBundleInspectorRef inspectorRef)
    4953{
    50     return toImpl(inspectorRef)->close();
     54#if ENABLE(INSPECTOR)
     55    toImpl(inspectorRef)->close();
     56#endif
    5157}
    5258
    5359void WKBundleInspectorEvaluateScriptForTest(WKBundleInspectorRef inspectorRef, long callID, WKStringRef script)
    5460{
    55     return toImpl(inspectorRef)->evaluateScriptForTest(callID, toWTFString(script));
     61#if ENABLE(INSPECTOR)
     62    toImpl(inspectorRef)->evaluateScriptForTest(callID, toWTFString(script));
     63#endif
    5664}
    5765
    5866void WKBundleInspectorSetPageProfilingEnabled(WKBundleInspectorRef inspectorRef, bool enabled)
    5967{
     68#if ENABLE(INSPECTOR)
    6069    if (enabled)
    6170        toImpl(inspectorRef)->startPageProfiling();
    6271    else
    6372        toImpl(inspectorRef)->stopPageProfiling();
     73#endif
    6474}
    65 
    66 #endif // ENABLE(INSPECTOR)
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.h

    r118705 r159788  
    2929#include <WebKit2/WKBase.h>
    3030
    31 #if ENABLE(INSPECTOR)
    32 
    3331#ifndef __cplusplus
    3432#include <stdbool.h>
     
    5149#endif
    5250
    53 #endif // ENABLE(INSPECTOR)
    54 
    5551#endif // WKBundleInspector_h
    5652
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h

    r155847 r159788  
    2828
    2929#include <WebKit2/WKBase.h>
     30#include <WebKit2/WKEvent.h>
     31#include <WebKit2/WKGeometry.h>
    3032
    3133#ifdef __cplusplus
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h

    r155770 r159788  
    3333#endif
    3434
     35#include <JavaScriptCore/JSBase.h>
    3536#include <WebKit2/WKUserContentInjectedFrames.h>
    3637#include <WebKit2/WKUserScriptInjectionTime.h>
  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm

    r159724 r159788  
    6565        return NO;
    6666
    67 #if !PLATFORM(IOS)
     67#if ENABLE(NETSCAPE_PLUGIN_API)
    6868    _plugin->openPluginPreferencePane();
    6969    return YES;
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r159724 r159788  
    13741374PassRefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement* appletElement, const URL&, const Vector<String>& paramNames, const Vector<String>& paramValues)
    13751375{
    1376 #if !PLATFORM(IOS)
     1376#if ENABLE(NETSCAPE_PLUGIN_API)
    13771377    RefPtr<Widget> plugin = createPlugin(pluginSize, appletElement, URL(), paramNames, paramValues, appletElement->serviceType(), false);
    13781378    if (!plugin) {
     
    13861386#else
    13871387    return 0;
    1388 #endif // !PLATFORM(IOS)
     1388#endif
    13891389}
    13901390
  • trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm

    r157323 r159788  
    2626#import "config.h"
    2727#import "WebInspector.h"
     28
     29#if ENABLE(INSPECTOR)
    2830
    2931#import <WebCore/SoftLinking.h>
     
    5557
    5658} // namespace WebKit
     59
     60#endif // ENABLE(INSPECTOR)
Note: See TracChangeset for help on using the changeset viewer.