Changeset 159788 in webkit
- Timestamp:
- Nov 26, 2013 12:07:48 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 31 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r159775 r159788 1 2013-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 1 80 2013-11-25 Dan Bernstein <mitz@apple.com> 2 81 -
trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.h
r158316 r159788 28 28 #if WK_API_ENABLED 29 29 30 #import <Foundation/Foundation.h> 31 30 32 WK_API_CLASS 31 33 @interface WKRemoteObjectInterface : NSObject -
trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.h
r158316 r159788 28 28 #if WK_API_ENABLED 29 29 30 #import <Foundation/Foundation.h> 31 30 32 @class WKRemoteObjectInterface; 31 33 -
trunk/Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h
r151656 r159788 26 26 #ifndef WKContextMenuItemTypes_h 27 27 #define WKContextMenuItemTypes_h 28 29 #include <stdint.h> 28 30 29 31 #ifdef __cplusplus -
trunk/Source/WebKit2/Shared/API/c/WKFindOptions.h
r151607 r159788 27 27 #define WKFindOptions_h 28 28 29 #include <stdint.h> 30 29 31 #ifdef __cplusplus 30 32 extern "C" { -
trunk/Source/WebKit2/Shared/API/c/WKMutableArray.h
r159199 r159788 28 28 29 29 #include <WebKit2/WKBase.h> 30 #include <stddef.h> 30 31 31 32 #ifndef __cplusplus -
trunk/Source/WebKit2/Shared/API/c/WKPageLoadTypes.h
r149317 r159788 26 26 #ifndef WKPageLoadTypes_h 27 27 #define WKPageLoadTypes_h 28 29 #include <stdint.h> 28 30 29 31 #ifdef __cplusplus -
trunk/Source/WebKit2/Shared/API/c/WKPageVisibilityTypes.h
r150695 r159788 27 27 #define WKPageVisibilityTypes_h 28 28 29 #include <stdint.h> 30 29 31 #ifdef __cplusplus 30 32 extern "C" { -
trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp
r159724 r159788 27 27 #include "WKPluginInformation.h" 28 28 29 #if ENABLE(NETSCAPE_PLUGIN_API)30 31 29 #include "PluginInformation.h" 32 30 #include "WKSharedAPICast.h" … … 37 35 WKStringRef WKPluginInformationBundleIdentifierKey() 38 36 { 37 #if ENABLE(NETSCAPE_PLUGIN_API) 39 38 static WebString* key = WebString::create(pluginInformationBundleIdentifierKey()).leakRef(); 40 39 return toAPI(key); 40 #else 41 return 0; 42 #endif 41 43 } 42 44 43 45 WKStringRef WKPluginInformationBundleVersionKey() 44 46 { 47 #if ENABLE(NETSCAPE_PLUGIN_API) 45 48 static WebString* key = WebString::create(pluginInformationBundleVersionKey()).leakRef(); 46 49 return toAPI(key); 50 #else 51 return 0; 52 #endif 47 53 } 48 54 49 55 WKStringRef WKPluginInformationBundleShortVersionKey() 50 56 { 57 #if ENABLE(NETSCAPE_PLUGIN_API) 51 58 static WebString* key = WebString::create(pluginInformationBundleShortVersionKey()).leakRef(); 52 59 return toAPI(key); 60 #else 61 return 0; 62 #endif 53 63 } 54 64 55 65 WKStringRef WKPluginInformationPathKey() 56 66 { 67 #if ENABLE(NETSCAPE_PLUGIN_API) 57 68 static WebString* key = WebString::create(pluginInformationPathKey()).leakRef(); 58 69 return toAPI(key); 70 #else 71 return 0; 72 #endif 59 73 } 60 74 61 75 WKStringRef WKPluginInformationDisplayNameKey() 62 76 { 77 #if ENABLE(NETSCAPE_PLUGIN_API) 63 78 static WebString* key = WebString::create(pluginInformationDisplayNameKey()).leakRef(); 64 79 return toAPI(key); 80 #else 81 return 0; 82 #endif 65 83 } 66 84 67 85 WKStringRef WKPluginInformationDefaultLoadPolicyKey() 68 86 { 87 #if ENABLE(NETSCAPE_PLUGIN_API) 69 88 static WebString* key = WebString::create(pluginInformationDefaultLoadPolicyKey()).leakRef(); 70 89 return toAPI(key); 90 #else 91 return 0; 92 #endif 71 93 } 72 94 73 95 WKStringRef WKPluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey() 74 96 { 97 #if ENABLE(NETSCAPE_PLUGIN_API) 75 98 static WebString* key = WebString::create(pluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey()).leakRef(); 76 99 return toAPI(key); 100 #else 101 return 0; 102 #endif 77 103 } 78 104 79 105 WKStringRef WKPluginInformationHasSandboxProfileKey() 80 106 { 107 #if ENABLE(NETSCAPE_PLUGIN_API) 81 108 static WebString* key = WebString::create(pluginInformationHasSandboxProfileKey()).leakRef(); 82 109 return toAPI(key); 110 #else 111 return 0; 112 #endif 83 113 } 84 114 85 115 WKStringRef WKPluginInformationFrameURLKey() 86 116 { 117 #if ENABLE(NETSCAPE_PLUGIN_API) 87 118 static WebString* key = WebString::create(pluginInformationFrameURLKey()).leakRef(); 88 119 return toAPI(key); 120 #else 121 return 0; 122 #endif 89 123 } 90 124 91 125 WKStringRef WKPluginInformationMIMETypeKey() 92 126 { 127 #if ENABLE(NETSCAPE_PLUGIN_API) 93 128 static WebString* key = WebString::create(pluginInformationMIMETypeKey()).leakRef(); 94 129 return toAPI(key); 130 #else 131 return 0; 132 #endif 95 133 } 96 134 97 135 WKStringRef WKPluginInformationPageURLKey() 98 136 { 137 #if ENABLE(NETSCAPE_PLUGIN_API) 99 138 static WebString* key = WebString::create(pluginInformationPageURLKey()).leakRef(); 100 139 return toAPI(key); 140 #else 141 return 0; 142 #endif 101 143 } 102 144 103 145 WKStringRef WKPluginInformationPluginspageAttributeURLKey() 104 146 { 147 #if ENABLE(NETSCAPE_PLUGIN_API) 105 148 static WebString* key = WebString::create(pluginInformationPluginspageAttributeURLKey()).leakRef(); 106 149 return toAPI(key); 150 #else 151 return 0; 152 #endif 107 153 } 108 154 109 155 WKStringRef WKPluginInformationPluginURLKey() 110 156 { 157 #if ENABLE(NETSCAPE_PLUGIN_API) 111 158 static WebString* key = WebString::create(pluginInformationPluginURLKey()).leakRef(); 112 159 return toAPI(key); 160 #else 161 return 0; 162 #endif 113 163 } 114 164 115 165 WKStringRef WKPlugInInformationReplacementObscuredKey() 116 166 { 167 #if ENABLE(NETSCAPE_PLUGIN_API) 117 168 static WebString* key = WebString::create(plugInInformationReplacementObscuredKey()).leakRef(); 118 169 return toAPI(key); 170 #else 171 return 0; 172 #endif 119 173 } 120 #endif // ENABLE(NETSCAPE_PLUGIN_API) -
trunk/Source/WebKit2/Shared/API/c/WKString.h
r100086 r159788 28 28 29 29 #include <WebKit2/WKBase.h> 30 #include <stddef.h> 30 31 31 32 #ifndef __cplusplus -
trunk/Source/WebKit2/UIProcess/API/C/WKCredentialTypes.h
r95901 r159788 27 27 #define WKCredentialTypes_h 28 28 29 #include <stdint.h> 30 29 31 #ifdef __cplusplus 30 32 extern "C" { -
trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h
r159715 r159788 28 28 29 29 #include <WebKit2/WKBase.h> 30 #include <WebKit2/WKGeometry.h> 30 31 31 32 #ifdef __cplusplus -
trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h
r159715 r159788 28 28 29 29 #include <WebKit2/WKBase.h> 30 #include <WebKit2/WKError.h> 31 #include <WebKit2/WKPageLoadTypes.h> 30 32 31 33 #ifdef __cplusplus -
trunk/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h
r159715 r159788 28 28 29 29 #include <WebKit2/WKBase.h> 30 #include <WebKit2/WKEvent.h> 31 #include <WebKit2/WKPageLoadTypes.h> 30 32 31 33 #ifdef __cplusplus -
trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h
r159715 r159788 28 28 29 29 #include <WebKit2/WKBase.h> 30 #include <WebKit2/WKEvent.h> 31 #include <WebKit2/WKGeometry.h> 32 #include <WebKit2/WKNativeEvent.h> 30 33 31 34 #ifdef __cplusplus -
trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp
r159204 r159788 42 42 return toAPI(WebPluginSiteDataManager::APIType); 43 43 #else 44 return API::Object::Type::Null;44 return toAPI(API::Object::Type::Null); 45 45 #endif 46 46 } -
trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h
r159724 r159788 38 38 WK_EXPORT bool WKContextIsPlugInUpdateAvailable(WKContextRef context, WKStringRef plugInBundleIdentifier); 39 39 40 #if ENABLE(NETSCAPE_PLUGIN_API)41 42 40 WK_EXPORT WKDictionaryRef WKContextCopyPlugInInfoForBundleIdentifier(WKContextRef context, WKStringRef plugInBundleIdentifier); 43 41 … … 67 65 WK_EXPORT WKStringRef WKPlugInInfoIsSandboxedKey(); 68 66 69 #endif // ENABLE(NETSCAPE_PLUGIN_API)70 71 67 #ifdef __cplusplus 72 68 } -
trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm
r159724 r159788 64 64 } 65 65 66 #if ENABLE(NETSCAPE_PLUGIN_API)67 68 66 WKDictionaryRef WKContextCopyPlugInInfoForBundleIdentifier(WKContextRef contextRef, WKStringRef plugInBundleIdentifierRef) 69 67 { 68 #if ENABLE(NETSCAPE_PLUGIN_API) 70 69 PluginModuleInfo plugin = toImpl(contextRef)->pluginInfoStore().findPluginWithBundleIdentifier(toWTFString(plugInBundleIdentifierRef)); 71 70 if (plugin.path.isNull()) … … 74 73 RefPtr<ImmutableDictionary> dictionary = createPluginInformationDictionary(plugin); 75 74 return toAPI(dictionary.release().leakRef()); 75 #else 76 return 0; 77 #endif 76 78 } 77 79 78 80 void WKContextGetInfoForInstalledPlugIns(WKContextRef contextRef, WKContextGetInfoForInstalledPlugInsBlock block) 79 81 { 82 #if ENABLE(NETSCAPE_PLUGIN_API) 80 83 Vector<PluginModuleInfo> plugins = toImpl(contextRef)->pluginInfoStore().plugins(); 81 84 … … 94 97 toImpl(contextRef)->deref(); 95 98 }); 99 #endif 96 100 } 97 101 … … 133 137 return WKPluginInformationHasSandboxProfileKey(); 134 138 } 135 136 #endif // ENABLE(NETSCAPE_PLUGIN_API) -
trunk/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h
r109819 r159788 24 24 */ 25 25 26 #ifndef WKInspectorPrivateMac_h 27 #define WKInspectorPrivateMac_h 26 #import <AppKit/NSWindow.h> 27 #import <WebKit2/WKDeclarationSpecifiers.h> 28 #import <WebKit2/WKInspector.h> 28 29 29 30 #ifdef __cplusplus … … 46 47 } 47 48 #endif 48 49 #endif // WKInspectorPrivateMac_h -
trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h
r153096 r159788 28 28 29 29 #include <WebKit2/WKBase.h> 30 #include <sys/types.h> 30 31 31 32 #ifdef __cplusplus -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h
r157951 r159788 32 32 #if WK_API_ENABLED 33 33 34 #import <Foundation/Foundation.h> 35 34 36 WK_API_CLASS 35 37 @interface WKBackForwardListItem : NSObject -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.h
r158779 r159788 32 32 #if WK_API_ENABLED 33 33 34 #import <Foundation/Foundation.h> 35 34 36 WK_API_CLASS 35 37 @interface WKNavigationData : NSObject -
trunk/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h
r156967 r159788 230 230 } 231 231 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 238 template<typename T> inline WKRetainPtr<T> adoptWK(T) WK_WARN_UNUSED_RETURN; 239 240 #undef WK_WARN_UNUSED_RETURN 233 241 234 242 template<typename T> inline WKRetainPtr<T> adoptWK(T o) -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h
r148938 r159788 29 29 #include <JavaScriptCore/JavaScript.h> 30 30 #include <WebKit2/WKBase.h> 31 #include <WebKit2/WKGeometry.h> 31 32 32 33 #ifndef __cplusplus -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp
r129743 r159788 27 27 #include "WKBundleInspector.h" 28 28 29 #if ENABLE(INSPECTOR)30 31 29 #include "WKAPICast.h" 32 30 #include "WKBundleAPICast.h" … … 38 36 WKTypeID WKBundleInspectorGetTypeID() 39 37 { 38 #if ENABLE(INSPECTOR) 40 39 return toAPI(WebInspector::APIType); 40 #else 41 return toAPI(API::Object::Type::Null); 42 #endif 41 43 } 42 44 43 45 void WKBundleInspectorShow(WKBundleInspectorRef inspectorRef) 44 46 { 45 return toImpl(inspectorRef)->show(); 47 #if ENABLE(INSPECTOR) 48 toImpl(inspectorRef)->show(); 49 #endif 46 50 } 47 51 48 52 void WKBundleInspectorClose(WKBundleInspectorRef inspectorRef) 49 53 { 50 return toImpl(inspectorRef)->close(); 54 #if ENABLE(INSPECTOR) 55 toImpl(inspectorRef)->close(); 56 #endif 51 57 } 52 58 53 59 void WKBundleInspectorEvaluateScriptForTest(WKBundleInspectorRef inspectorRef, long callID, WKStringRef script) 54 60 { 55 return toImpl(inspectorRef)->evaluateScriptForTest(callID, toWTFString(script)); 61 #if ENABLE(INSPECTOR) 62 toImpl(inspectorRef)->evaluateScriptForTest(callID, toWTFString(script)); 63 #endif 56 64 } 57 65 58 66 void WKBundleInspectorSetPageProfilingEnabled(WKBundleInspectorRef inspectorRef, bool enabled) 59 67 { 68 #if ENABLE(INSPECTOR) 60 69 if (enabled) 61 70 toImpl(inspectorRef)->startPageProfiling(); 62 71 else 63 72 toImpl(inspectorRef)->stopPageProfiling(); 73 #endif 64 74 } 65 66 #endif // ENABLE(INSPECTOR) -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.h
r118705 r159788 29 29 #include <WebKit2/WKBase.h> 30 30 31 #if ENABLE(INSPECTOR)32 33 31 #ifndef __cplusplus 34 32 #include <stdbool.h> … … 51 49 #endif 52 50 53 #endif // ENABLE(INSPECTOR)54 55 51 #endif // WKBundleInspector_h 56 52 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
r155847 r159788 28 28 29 29 #include <WebKit2/WKBase.h> 30 #include <WebKit2/WKEvent.h> 31 #include <WebKit2/WKGeometry.h> 30 32 31 33 #ifdef __cplusplus -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h
r155770 r159788 33 33 #endif 34 34 35 #include <JavaScriptCore/JSBase.h> 35 36 #include <WebKit2/WKUserContentInjectedFrames.h> 36 37 #include <WebKit2/WKUserScriptInjectionTime.h> -
trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm
r159724 r159788 65 65 return NO; 66 66 67 #if !PLATFORM(IOS)67 #if ENABLE(NETSCAPE_PLUGIN_API) 68 68 _plugin->openPluginPreferencePane(); 69 69 return YES; -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
r159724 r159788 1374 1374 PassRefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement* appletElement, const URL&, const Vector<String>& paramNames, const Vector<String>& paramValues) 1375 1375 { 1376 #if !PLATFORM(IOS)1376 #if ENABLE(NETSCAPE_PLUGIN_API) 1377 1377 RefPtr<Widget> plugin = createPlugin(pluginSize, appletElement, URL(), paramNames, paramValues, appletElement->serviceType(), false); 1378 1378 if (!plugin) { … … 1386 1386 #else 1387 1387 return 0; 1388 #endif // !PLATFORM(IOS)1388 #endif 1389 1389 } 1390 1390 -
trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm
r157323 r159788 26 26 #import "config.h" 27 27 #import "WebInspector.h" 28 29 #if ENABLE(INSPECTOR) 28 30 29 31 #import <WebCore/SoftLinking.h> … … 55 57 56 58 } // namespace WebKit 59 60 #endif // ENABLE(INSPECTOR)
Note: See TracChangeset
for help on using the changeset viewer.