Changeset 76991 in webkit
- Timestamp:
- Jan 28, 2011 2:31:11 PM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 62 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r76989 r76991 1 2011-01-28 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 Clean up the mess introduced when config.h was added to the project: 6 7 - Remove the contents of WebKit2Prefix.h that is now in config.h, to avoid including everything 8 twice in each file, probably slowing down compile time. 9 10 - Add config.h to all the files that were forgotten in order to keep the build from breaking. 11 12 - Added trap to ensure that config.h is included at the top of every implementation file. If this 13 had been added it would have caught the previous issue. 14 1 15 2011-01-28 Stephanie Lewis <slewis@apple.com> 2 16 -
trunk/Source/WebKit2/Platform/mac/ModuleMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "Module.h" 27 28 -
trunk/Source/WebKit2/Platform/mac/RunLoopMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "RunLoop.h" 27 28 -
trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 27 #import "PluginControllerProxy.h" 28 26 29 #if ENABLE(PLUGIN_PROCESS) 27 28 #import "PluginControllerProxy.h"29 30 30 31 #import <QuartzCore/QuartzCore.h> -
trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 27 #import "PluginProcess.h" 28 26 29 #if ENABLE(PLUGIN_PROCESS) 27 30 28 31 // FIXME (WebKit2) <rdar://problem/8728860> WebKit2 needs to be localized 29 32 #define UI_STRING(__str, __desc) [NSString stringWithUTF8String:__str] 30 31 #import "PluginProcess.h"32 33 33 34 #import "NetscapePlugin.h" -
trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 27 #import "PluginProcessMain.h" 28 26 29 #if ENABLE(PLUGIN_PROCESS) 27 28 #import "PluginProcessMain.h"29 30 30 31 #import "CommandLine.h" -
trunk/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WKCertificateInfoMac.h" 27 28 -
trunk/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WKURLRequestNS.h" 27 28 -
trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WKURLResponseNS.h" 27 28 -
trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "NetscapePluginModule.h" 27 28 -
trunk/Source/WebKit2/Shared/mac/NativeWebKeyboardEventMac.mm
r68538 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "NativeWebKeyboardEvent.h" 27 28 -
trunk/Source/WebKit2/Shared/mac/PasteboardTypes.mm
r76186 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "PasteboardTypes.h" 28 27 29 #import <wtf/RetainPtr.h> 28 30 -
trunk/Source/WebKit2/Shared/mac/PlatformCertificateInfo.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "PlatformCertificateInfo.h" 27 28 -
trunk/Source/WebKit2/Shared/mac/PrintInfoMac.mm
r75979 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "PrintInfo.h" 27 28 -
trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 27 #import "SandboxExtension.h" 28 26 29 #if ENABLE(WEB_PROCESS_SANDBOX) 27 28 #import "SandboxExtension.h"29 30 30 31 #import "ArgumentDecoder.h" -
trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebCoreArgumentCoders.h" 27 28 -
trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm
r76745 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebEventFactory.h" 27 28 -
trunk/Source/WebKit2/Shared/mac/WebMemorySampler.mac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 27 #import "WebMemorySampler.h" 28 26 29 #if ENABLE(MEMORY_SAMPLER) 27 28 #import "WebMemorySampler.h"29 30 30 31 #import <JavaScriptCore/MemoryStatistics.h> -
trunk/Source/WebKit2/Shared/mac/WebURLRequestMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebURLRequest.h" 27 28 -
trunk/Source/WebKit2/Shared/mac/WebURLResponseMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebURLResponse.h" 27 28 -
trunk/Source/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "FindIndicatorWindow.h" 27 28 -
trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.mm
r75344 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "PDFViewController.h" 27 28 -
trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm
r76657 r76991 24 24 */ 25 25 26 #import " NativeWebKeyboardEvent.h"26 #import "config.h" 27 27 #import "PageClientImpl.h" 28 28 29 29 #import "DataReference.h" 30 30 #import "FindIndicator.h" 31 #import "NativeWebKeyboardEvent.h" 31 32 #import "WKAPICast.h" 32 33 #import "WKStringCF.h" -
trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm
r76821 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WKPrintingView.h" 27 28 -
trunk/Source/WebKit2/UIProcess/API/mac/WKTextInputWindowController.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WKTextInputWindowController.h" 27 28 -
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
r76821 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WKView.h" 27 28 -
trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "ProcessLauncher.h" 27 28 -
trunk/Source/WebKit2/UIProcess/Launcher/mac/ThreadLauncherMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "ThreadLauncher.h" 27 28 -
trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "PluginInfoStore.h" 27 28 -
trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 27 #import "PluginProcessProxy.h" 28 26 29 #if ENABLE(PLUGIN_PROCESS) 27 28 #import "PluginProcessProxy.h"29 30 30 31 #import "PluginProcessCreationParameters.h" -
trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp
r76917 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #include "WebPageProxy.h" 27 28 -
trunk/Source/WebKit2/UIProcess/mac/BackingStoreMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "BackingStore.h" 27 28 -
trunk/Source/WebKit2/UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "ChunkedUpdateDrawingAreaProxy.h" 27 28 -
trunk/Source/WebKit2/UIProcess/mac/LayerBackedDrawingAreaProxyMac.mm
r76453 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "LayerBackedDrawingAreaProxy.h" 27 28 -
trunk/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "TextChecker.h" 27 28 -
trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm
r76559 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebContext.h" 27 28 -
trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebContextMenuProxyMac.h" 27 28 -
trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
r73976 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebInspectorProxy.h" 27 28 -
trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebPageProxy.h" 27 28 -
trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm
r76983 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebPopupMenuProxyMac.h" 27 28 -
trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebPreferences.h" 27 28 -
trunk/Source/WebKit2/WebKit2Prefix.h
r76014 r76991 25 25 */ 26 26 27 #if defined (BUILDING_GTK__)28 #include <WebCore/config.h>29 #endif /* defined (BUILDING_GTK__) */30 31 #include <wtf/Platform.h>32 #include <wtf/DisallowCType.h>33 #ifdef __cplusplus34 #include <wtf/FastMalloc.h>35 #endif36 37 #ifdef __cplusplus38 #define EXTERN_C_BEGIN extern "C" {39 #define EXTERN_C_END }40 #else41 #define EXTERN_C_BEGIN42 #define EXTERN_C_END43 #endif44 45 // For defining getters to a static value, where the getters have internal linkage46 #define DEFINE_STATIC_GETTER(type, name, arguments) \47 static const type& name() \48 { \49 DEFINE_STATIC_LOCAL(type, name##Value, arguments); \50 return name##Value; \51 }52 53 #if defined(BUILDING_QT__)54 55 #define WTF_USE_JSC 156 #define WTF_USE_V8 057 58 #define JS_EXPORTDATA59 #define JS_EXPORTCLASS60 61 // Disable notImplemented() warnings not to break layout tests.62 // FIXME: WebKit2 logging system should behave identical to WebKit1.63 #define DISABLE_NOT_IMPLEMENTED_WARNINGS 164 65 #elif defined(__APPLE__)66 67 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)68 #define ENABLE_WEB_PROCESS_SANDBOX 169 #endif70 71 #define ENABLE_PLUGIN_PROCESS 172 73 #if PLATFORM(MAC)74 #define ENABLE_MEMORY_SAMPLER 175 #endif76 77 #import <CoreGraphics/CoreGraphics.h>78 79 27 #ifdef __OBJC__ 80 28 #import <Cocoa/Cocoa.h> 81 29 #endif 82 30 83 /* WebKit has no way to pull settings from WebCore/config.h for now */ 84 /* so we assume WebKit is always being compiled on top of JavaScriptCore */ 85 #define WTF_USE_JSC 1 86 #define WTF_USE_V8 0 87 88 #define JS_EXPORTDATA 89 #define JS_EXPORTCLASS 90 #define WEBKIT_EXPORTDATA 91 92 #include <WebCore/EmptyProtocolDefinitions.h> 93 94 #elif defined(WIN32) || defined(_WIN32) 95 96 #ifndef _WIN32_WINNT 97 #define _WIN32_WINNT 0x0500 31 #ifdef __cplusplus 32 #define new ("if you use new/delete make sure to include config.h at the top of the file"()) 33 #define delete ("if you use new/delete make sure to include config.h at the top of the file"()) 98 34 #endif 99 100 #ifndef WINVER101 #define WINVER 0x0500102 #endif103 104 /* If we don't define these, they get defined in windef.h. */105 /* We want to use std::min and std::max. */106 #ifndef max107 #define max max108 #endif109 #ifndef min110 #define min min111 #endif112 113 #ifndef _WINSOCKAPI_114 #define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */115 #endif116 117 #include <WebCore/config.h>118 #include <windows.h>119 120 #if PLATFORM(CG)121 #include <CoreGraphics/CoreGraphics.h>122 #endif123 124 #endif /* defined(WIN32) || defined(_WIN32) */125 -
trunk/Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "Download.h" 27 28 -
trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
r76617 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "NetscapePlugin.h" 27 28 -
trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 27 #import "PluginProxy.h" 28 26 29 #if ENABLE(PLUGIN_PROCESS) 27 28 #import "PluginProxy.h"29 30 30 31 #import <WebKitSystemInterface.h> -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebContextMenuClient.h" 27 28 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm
r76186 r76991 24 24 */ 25 25 26 #import "config.h" 27 #import "WebDragClient.h" 28 26 29 #import "PasteboardTypes.h" 27 30 #import "ShareableBitmap.h" 28 31 #import "WebCoreArgumentCoders.h" 29 #import "WebDragClient.h"30 32 #import "WebPage.h" 31 33 #import "WebPageProxyMessages.h" -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm
r76418 r76991 28 28 */ 29 29 30 #import "config.h" 30 31 #import "WebEditorClient.h" 31 32 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebErrors.h" 27 28 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm
r66794 r76991 18 18 */ 19 19 20 #import "config.h" 20 21 #import "WebFrameNetworkingContext.h" 21 22 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebPopupMenuMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebPopupMenu.h" 27 28 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
r76756 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebSystemInterface.h" 27 28 -
trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp
r76653 r76991 24 24 */ 25 25 26 #include "config.h" 26 27 #include "LayerTreeHost.h" 27 28 -
trunk/Source/WebKit2/WebProcess/WebPage/mac/AccessibilityWebPageObject.mm
r75034 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "AccessibilityWebPageObject.h" 27 28 -
trunk/Source/WebKit2/WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 27 #import "LayerBackedDrawingArea.h" 28 26 29 #if USE(ACCELERATED_COMPOSITING) 27 28 #import "LayerBackedDrawingArea.h"29 30 30 31 #import "DrawingAreaProxyMessageKinds.h" -
trunk/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm
r76653 r76991 24 24 */ 25 25 26 #include "LayerTreeHost.h" 26 #import "config.h" 27 #import "LayerTreeHost.h" 27 28 28 29 namespace WebKit { -
trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm
r71857 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebInspector.h" 27 28 -
trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
r76418 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebPage.h" 27 28 -
trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm
r76563 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebProcess.h" 27 28 -
trunk/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm
r76034 r76991 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebProcessMain.h" 27 28 -
trunk/Source/WebKit2/config.h
r76922 r76991 25 25 */ 26 26 27 #ifdef __cplusplus 28 29 // These undefs match up with defines in WebKit2Prefix.h for Mac OS X. 30 // Helps us catch if anyone uses new or delete by accident in code and doesn't include "config.h". 31 #undef new 32 #undef delete 33 #include <wtf/FastMalloc.h> 34 35 #endif 36 27 37 #if defined (BUILDING_GTK__) 28 38 #include <WebCore/config.h> … … 31 41 #include <wtf/DisallowCType.h> 32 42 #include <wtf/Platform.h> 33 #ifdef __cplusplus34 #include <wtf/FastMalloc.h>35 #endif36 43 37 44 #ifdef __cplusplus -
trunk/Source/WebKit2/mac/MainMac.cpp
r69992 r76991 25 25 26 26 #include <dlfcn.h> 27 #include <stdlib.h> 28 #include <stdio.h> 29 #include <unistd.h> 27 30 28 31 static void closeUnusedFileDescriptors()
Note: See TracChangeset
for help on using the changeset viewer.