Reviewed by Dan Bernstein.
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Jan 2011 02:08:37 +0000 (02:08 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Jan 2011 02:08:37 +0000 (02:08 +0000)
        https://bugs.webkit.org/show_bug.cgi?id=52943
        Objective-C files should use #import, not #include

        * UIProcess/API/C/WebKit2.h: This is an interesting one, because it's cross-platform, and
        there is more than one WKView.h.

        * Platform/mac/ModuleMac.mm:
        * Platform/mac/RunLoopMac.mm:
        * PluginProcess/mac/PluginControllerProxyMac.mm:
        * PluginProcess/mac/PluginProcessMac.mm:
        * PluginProcess/mac/PluginProcessMainMac.mm:
        * Shared/API/c/mac/WKCertificateInfoMac.mm:
        * Shared/API/c/mac/WKURLRequestNS.mm:
        * Shared/API/c/mac/WKURLResponseNS.mm:
        * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
        * Shared/mac/PlatformCertificateInfo.mm:
        * Shared/mac/SandboxExtensionMac.mm:
        * Shared/mac/WebCoreArgumentCodersMac.mm:
        * Shared/mac/WebMemorySampler.mac.mm:
        * Shared/mac/WebURLRequestMac.mm:
        * Shared/mac/WebURLResponseMac.mm:
        * UIProcess/API/mac/FindIndicatorWindow.mm:
        * UIProcess/API/mac/WKTextInputWindowController.mm:
        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
        * UIProcess/Launcher/mac/ThreadLauncherMac.mm:
        * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
        * UIProcess/mac/BackingStoreMac.mm:
        * UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm:
        * UIProcess/mac/LayerBackedDrawingAreaProxyMac.mm:
        * UIProcess/mac/TextCheckerMac.mm:
        * UIProcess/mac/WebContextMac.mm:
        * UIProcess/mac/WebContextMenuProxyMac.mm:
        * UIProcess/mac/WebPageProxyMac.mm:
        * UIProcess/mac/WebPopupMenuProxyMac.mm:
        * UIProcess/mac/WebPreferencesMac.mm:
        * WebProcess/Downloads/mac/DownloadMac.mm:
        * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
        * WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm:
        * WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
        * WebProcess/WebCoreSupport/mac/WebDatabaseManagerMac.mm:
        * WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm:
        * WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:
        * WebProcess/WebCoreSupport/mac/WebPopupMenuMac.mm:
        * WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm:
        * WebProcess/WebPage/mac/WebPageMac.mm:
        * WebProcess/mac/WebProcessMac.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@76418 268f45cc-cd09-0410-ab3c-d52691b4dbfc

43 files changed:
Source/WebKit2/ChangeLog
Source/WebKit2/Platform/mac/ModuleMac.mm
Source/WebKit2/Platform/mac/RunLoopMac.mm
Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm
Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm
Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm
Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm
Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.mm
Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.mm
Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
Source/WebKit2/Shared/mac/PlatformCertificateInfo.mm
Source/WebKit2/Shared/mac/SandboxExtensionMac.mm
Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
Source/WebKit2/Shared/mac/WebMemorySampler.mac.mm
Source/WebKit2/Shared/mac/WebURLRequestMac.mm
Source/WebKit2/Shared/mac/WebURLResponseMac.mm
Source/WebKit2/UIProcess/API/C/WebKit2.h
Source/WebKit2/UIProcess/API/mac/FindIndicatorWindow.mm
Source/WebKit2/UIProcess/API/mac/WKTextInputWindowController.mm
Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm
Source/WebKit2/UIProcess/Launcher/mac/ThreadLauncherMac.mm
Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
Source/WebKit2/UIProcess/mac/BackingStoreMac.mm
Source/WebKit2/UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm
Source/WebKit2/UIProcess/mac/LayerBackedDrawingAreaProxyMac.mm
Source/WebKit2/UIProcess/mac/TextCheckerMac.mm
Source/WebKit2/UIProcess/mac/WebContextMac.mm
Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm
Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm
Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm
Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm
Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm
Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm
Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm
Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDatabaseManagerMac.mm
Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm
Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm
Source/WebKit2/WebProcess/WebCoreSupport/mac/WebPopupMenuMac.mm
Source/WebKit2/WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm
Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
Source/WebKit2/WebProcess/mac/WebProcessMac.mm

index b9389fa..fe2e6cf 100644 (file)
@@ -1,3 +1,55 @@
+2011-01-21  Alexey Proskuryakov  <ap@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=52943
+        Objective-C files should use #import, not #include
+
+        * UIProcess/API/C/WebKit2.h: This is an interesting one, because it's cross-platform, and
+        there is more than one WKView.h.
+
+        * Platform/mac/ModuleMac.mm:
+        * Platform/mac/RunLoopMac.mm:
+        * PluginProcess/mac/PluginControllerProxyMac.mm:
+        * PluginProcess/mac/PluginProcessMac.mm:
+        * PluginProcess/mac/PluginProcessMainMac.mm:
+        * Shared/API/c/mac/WKCertificateInfoMac.mm:
+        * Shared/API/c/mac/WKURLRequestNS.mm:
+        * Shared/API/c/mac/WKURLResponseNS.mm:
+        * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+        * Shared/mac/PlatformCertificateInfo.mm:
+        * Shared/mac/SandboxExtensionMac.mm:
+        * Shared/mac/WebCoreArgumentCodersMac.mm:
+        * Shared/mac/WebMemorySampler.mac.mm:
+        * Shared/mac/WebURLRequestMac.mm:
+        * Shared/mac/WebURLResponseMac.mm:
+        * UIProcess/API/mac/FindIndicatorWindow.mm:
+        * UIProcess/API/mac/WKTextInputWindowController.mm:
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+        * UIProcess/Launcher/mac/ThreadLauncherMac.mm:
+        * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+        * UIProcess/mac/BackingStoreMac.mm:
+        * UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm:
+        * UIProcess/mac/LayerBackedDrawingAreaProxyMac.mm:
+        * UIProcess/mac/TextCheckerMac.mm:
+        * UIProcess/mac/WebContextMac.mm:
+        * UIProcess/mac/WebContextMenuProxyMac.mm:
+        * UIProcess/mac/WebPageProxyMac.mm:
+        * UIProcess/mac/WebPopupMenuProxyMac.mm:
+        * UIProcess/mac/WebPreferencesMac.mm:
+        * WebProcess/Downloads/mac/DownloadMac.mm:
+        * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+        * WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm:
+        * WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
+        * WebProcess/WebCoreSupport/mac/WebDatabaseManagerMac.mm:
+        * WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm:
+        * WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:
+        * WebProcess/WebCoreSupport/mac/WebPopupMenuMac.mm:
+        * WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm:
+        * WebProcess/WebPage/mac/WebPageMac.mm:
+        * WebProcess/mac/WebProcessMac.mm:
+
 2011-01-21  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Sam Weinig.
index fa38745..679fd9e 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "Module.h"
+#import "Module.h"
 
 namespace WebKit {
 
index ca044f3..3175594 100644 (file)
@@ -23,9 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "RunLoop.h"
+#import "RunLoop.h"
 
-#include "WorkItem.h"
+#import "WorkItem.h"
 
 void RunLoop::performWork(void* context)
 {
index 40d4f6d..aebd644 100644 (file)
 
 #if ENABLE(PLUGIN_PROCESS)
 
-#include "PluginControllerProxy.h"
+#import "PluginControllerProxy.h"
 
-#include <QuartzCore/QuartzCore.h>
-#include "PluginProcess.h"
-#include "WebKitSystemInterface.h"
+#import <QuartzCore/QuartzCore.h>
+#import "PluginProcess.h"
+#import "WebKitSystemInterface.h"
 
 using namespace WebCore;
 
index 3919c8b..893914a 100644 (file)
 // FIXME (WebKit2) <rdar://problem/8728860> WebKit2 needs to be localized
 #define UI_STRING(__str, __desc) [NSString stringWithUTF8String:__str]
  
-#include "PluginProcess.h"
+#import "PluginProcess.h"
 
-#include "NetscapePlugin.h"
-#include "PluginProcessShim.h"
-#include "PluginProcessCreationParameters.h"
-#include <WebKitSystemInterface.h>
-#include <dlfcn.h>
+#import "NetscapePlugin.h"
+#import "PluginProcessShim.h"
+#import "PluginProcessCreationParameters.h"
+#import <WebKitSystemInterface.h>
+#import <dlfcn.h>
 
 namespace WebKit {
 
index 36cc2a1..4da90c4 100644 (file)
 
 #if ENABLE(PLUGIN_PROCESS)
 
-#include "PluginProcessMain.h"
-
-#include "CommandLine.h"
-#include "PluginProcess.h"
-#include "RunLoop.h"
-#include <runtime/InitializeThreading.h>
-#include <servers/bootstrap.h>
-#include <wtf/text/CString.h>
-#include <wtf/text/WTFString.h>
-#include <WebKitSystemInterface.h>
+#import "PluginProcessMain.h"
+
+#import "CommandLine.h"
+#import "PluginProcess.h"
+#import "RunLoop.h"
+#import <runtime/InitializeThreading.h>
+#import <servers/bootstrap.h>
+#import <wtf/text/CString.h>
+#import <wtf/text/WTFString.h>
+#import <WebKitSystemInterface.h>
 
 // FIXME: We should be doing this another way.
 extern "C" kern_return_t bootstrap_look_up2(mach_port_t, const name_t, mach_port_t*, pid_t, uint64_t);
index 2ffc1f5..11f0a4d 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WKCertificateInfoMac.h"
+#import "WKCertificateInfoMac.h"
 
-#include "WKAPICast.h"
-#include "WebCertificateInfo.h"
+#import "WKAPICast.h"
+#import "WebCertificateInfo.h"
 
 using namespace WebKit;
 
index 7cc69fa..bcaab58 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WKURLRequestNS.h"
+#import "WKURLRequestNS.h"
 
-#include "WKAPICast.h"
-#include "WebURLRequest.h"
+#import "WKAPICast.h"
+#import "WebURLRequest.h"
 
 using namespace WebKit;
 
index 79b874d..9483620 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WKURLResponseNS.h"
+#import "WKURLResponseNS.h"
 
-#include "WKAPICast.h"
-#include "WebURLResponse.h"
+#import "WKAPICast.h"
+#import "WebURLResponse.h"
 
 using namespace WebKit;
 
index 6ecacf0..846f43c 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "NetscapePluginModule.h"
+#import "NetscapePluginModule.h"
 
-#include <WebCore/WebCoreNSStringExtras.h>
-#include <wtf/HashSet.h>
+#import <WebCore/WebCoreNSStringExtras.h>
+#import <wtf/HashSet.h>
 
 using namespace WebCore;
 
index 0f3fee7..880d52e 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "PlatformCertificateInfo.h"
+#import "PlatformCertificateInfo.h"
 
-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
-#include <WebKitSystemInterface.h>
-#include <Security/Security.h>
+#import "ArgumentDecoder.h"
+#import "ArgumentEncoder.h"
+#import <WebKitSystemInterface.h>
+#import <Security/Security.h>
 
 using namespace WebCore;
 
index 68b5849..3e39b69 100644 (file)
 
 #if ENABLE(WEB_PROCESS_SANDBOX)
 
-#include "SandboxExtension.h"
-
-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
-#include "DataReference.h"
-#include "WebKitSystemInterface.h"
-#include <WebCore/FileSystem.h>
-#include <wtf/text/CString.h>
+#import "SandboxExtension.h"
+
+#import "ArgumentDecoder.h"
+#import "ArgumentEncoder.h"
+#import "DataReference.h"
+#import "WebKitSystemInterface.h"
+#import <WebCore/FileSystem.h>
+#import <wtf/text/CString.h>
 
 using namespace WebCore;
 
index 8ffba8a..7747b77 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WebCoreArgumentCoders.h"
+#import "WebCoreArgumentCoders.h"
 
-#include "ArgumentCodersCF.h"
-#include "WebKitSystemInterface.h"
+#import "ArgumentCodersCF.h"
+#import "WebKitSystemInterface.h"
 
 namespace CoreIPC {
 
index 5be52d4..f74ac77 100644 (file)
 
 #if ENABLE(MEMORY_SAMPLER)  
 
-#include "WebMemorySampler.h"
+#import "WebMemorySampler.h"
 
-#include <JavaScriptCore/MemoryStatistics.h>
-#include <mach/mach.h>
-#include <mach/task.h>
-#include <mach/mach_types.h>
-#include <malloc/malloc.h>
-#include <runtime/JSLock.h>
-#include <WebCore/JSDOMWindow.h>
-#include <wtf/CurrentTime.h>
+#import <JavaScriptCore/MemoryStatistics.h>
+#import <mach/mach.h>
+#import <mach/task.h>
+#import <mach/mach_types.h>
+#import <malloc/malloc.h>
+#import <runtime/JSLock.h>
+#import <WebCore/JSDOMWindow.h>
+#import <wtf/CurrentTime.h>
 
 using namespace WebCore;
 using namespace JSC;
index a7196f7..753025c 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WebURLRequest.h"
+#import "WebURLRequest.h"
 
 namespace WebKit {
 
index ff5b6e6..114f16f 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WebURLResponse.h"
+#import "WebURLResponse.h"
 
 namespace WebKit {
 
index 02a339f..2425c49 100644 (file)
@@ -56,7 +56,9 @@
 #include <WebKit2/WKURLRequest.h>
 #include <WebKit2/WKURLResponse.h>
 
-#if !(defined(__APPLE__) && __APPLE__) || (defined(__OBJC__) && __OBJC__)
+#if defined(__OBJC__) && __OBJC__
+#import <WebKit2/WKView.h>
+#elif !(defined(__APPLE__) && __APPLE__)
 #include <WebKit2/WKView.h>
 #endif
 
index 5b93a9e..ae7db52 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "FindIndicatorWindow.h"
+#import "FindIndicatorWindow.h"
 
-#include "FindIndicator.h"
-#include <WebCore/GraphicsContext.h>
+#import "FindIndicator.h"
+#import <WebCore/GraphicsContext.h>
 
 static const double bounceAnimationDuration = 0.12;
 static const double timeBeforeFadeStarts = bounceAnimationDuration + 0.2;
index b7dae31..2a30faf 100644 (file)
@@ -23,9 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WKTextInputWindowController.h"
+#import "WKTextInputWindowController.h"
 
-#include <WebKitSystemInterface.h>
+#import <WebKitSystemInterface.h>
 
 @interface WKTextInputPanel : NSPanel {
     NSTextView *_inputTextView;
index a725d6b..edc3660 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ProcessLauncher.h"
-
-#include "RunLoop.h"
-#include "WebProcess.h"
-#include "WebKitSystemInterface.h"
-#include <crt_externs.h>
-#include <mach-o/dyld.h>
-#include <mach/machine.h>
-#include <runtime/InitializeThreading.h>
-#include <servers/bootstrap.h>
-#include <spawn.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RetainPtr.h>
-#include <wtf/Threading.h>
-#include <wtf/text/CString.h>
-#include <wtf/text/WTFString.h>
+#import "ProcessLauncher.h"
+
+#import "RunLoop.h"
+#import "WebProcess.h"
+#import "WebKitSystemInterface.h"
+#import <crt_externs.h>
+#import <mach-o/dyld.h>
+#import <mach/machine.h>
+#import <runtime/InitializeThreading.h>
+#import <servers/bootstrap.h>
+#import <spawn.h>
+#import <sys/param.h>
+#import <sys/stat.h>
+#import <wtf/PassRefPtr.h>
+#import <wtf/RetainPtr.h>
+#import <wtf/Threading.h>
+#import <wtf/text/CString.h>
+#import <wtf/text/WTFString.h>
 
 using namespace WebCore;
 
index 8aac275..975c0d7 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ThreadLauncher.h"
+#import "ThreadLauncher.h"
 
-#include "RunLoop.h"
-#include "WebProcess.h"
-#include "WebSystemInterface.h"
-#include <runtime/InitializeThreading.h>
-#include <wtf/Threading.h>
+#import "RunLoop.h"
+#import "WebProcess.h"
+#import "WebSystemInterface.h"
+#import <runtime/InitializeThreading.h>
+#import <wtf/Threading.h>
 
 namespace WebKit {
 
index b787101..b7abbb0 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "PluginInfoStore.h"
+#import "PluginInfoStore.h"
 
-#include "NetscapePluginModule.h"
-#include "WebKitSystemInterface.h"
-#include <WebCore/WebCoreNSStringExtras.h>
-#include <wtf/HashSet.h>
-#include <wtf/RetainPtr.h>
+#import "NetscapePluginModule.h"
+#import "WebKitSystemInterface.h"
+#import <WebCore/WebCoreNSStringExtras.h>
+#import <wtf/HashSet.h>
+#import <wtf/RetainPtr.h>
 
 using namespace WebCore;
 
index eaf8aef..bcd5466 100644 (file)
 
 #if ENABLE(PLUGIN_PROCESS)
 
-#include "PluginProcessProxy.h"
+#import "PluginProcessProxy.h"
 
-#include "PluginProcessCreationParameters.h"
-#include "WebKitSystemInterface.h"
+#import "PluginProcessCreationParameters.h"
+#import "WebKitSystemInterface.h"
 
 namespace WebKit {
 
index eacfefa..a65a87e 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "BackingStore.h"
+#import "BackingStore.h"
 
-#include "CGUtilities.h"
-#include "ShareableBitmap.h"
-#include "UpdateInfo.h"
-#include "WebPageProxy.h"
-#include <WebCore/GraphicsContext.h>
+#import "CGUtilities.h"
+#import "ShareableBitmap.h"
+#import "UpdateInfo.h"
+#import "WebPageProxy.h"
+#import <WebCore/GraphicsContext.h>
 
 using namespace WebCore;
 
index 909745b..ac16a5e 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ChunkedUpdateDrawingAreaProxy.h"
-
-#include "DrawingAreaMessageKinds.h"
-#include "DrawingAreaProxyMessageKinds.h"
-#include "UpdateChunk.h"
-#include "WKAPICast.h"
-#include "WKView.h"
-#include "WebPageProxy.h"
+#import "ChunkedUpdateDrawingAreaProxy.h"
+
+#import "DrawingAreaMessageKinds.h"
+#import "DrawingAreaProxyMessageKinds.h"
+#import "UpdateChunk.h"
+#import "WKAPICast.h"
+#import "WKView.h"
+#import "WebPageProxy.h"
 
 using namespace WebCore;
 
index 846eb25..8159f96 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "LayerBackedDrawingAreaProxy.h"
+#import "LayerBackedDrawingAreaProxy.h"
 
-#include "DrawingAreaMessageKinds.h"
-#include "DrawingAreaProxyMessageKinds.h"
-#include <QuartzCore/QuartzCore.h>
-#include "WKAPICast.h"
-#include "WKView.h"
-#include "WKViewInternal.h"
-#include "WebKitSystemInterface.h"
-#include "WebPageProxy.h"
+#import "DrawingAreaMessageKinds.h"
+#import "DrawingAreaProxyMessageKinds.h"
+#import <QuartzCore/QuartzCore.h>
+#import "WKAPICast.h"
+#import "WKView.h"
+#import "WKViewInternal.h"
+#import "WebKitSystemInterface.h"
+#import "WebPageProxy.h"
 
 using namespace WebCore;
 
index 6c671f0..05316e7 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "TextChecker.h"
+#import "TextChecker.h"
 
-#include "TextCheckerState.h"
-#include <wtf/RetainPtr.h>
+#import "TextCheckerState.h"
+#import <wtf/RetainPtr.h>
 
 #ifndef BUILDING_ON_SNOW_LEOPARD
 #import <AppKit/NSTextChecker.h>
index 4d1679f..a0e3b05 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WebContext.h"
+#import "WebContext.h"
 
-#include "WebKitSystemInterface.h"
-#include "WebProcessCreationParameters.h"
-#include <WebCore/FileSystem.h>
-#include <sys/param.h>
+#import "WebKitSystemInterface.h"
+#import "WebProcessCreationParameters.h"
+#import <WebCore/FileSystem.h>
+#import <sys/param.h>
 
 using namespace WebCore;
 
index d76b997..57fa6a3 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WebContextMenuProxyMac.h"
+#import "WebContextMenuProxyMac.h"
 
-#include "PageClientImpl.h"
-#include "WebContextMenuItemData.h"
-#include "WKView.h"
+#import "PageClientImpl.h"
+#import "WebContextMenuItemData.h"
+#import "WKView.h"
 
-#include <WebCore/IntRect.h>
-#include <WebKitSystemInterface.h>
+#import <WebCore/IntRect.h>
+#import <WebKitSystemInterface.h>
 
 using namespace WebCore;
 
index cd3e6f1..422770a 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WebPageProxy.h"
+#import "WebPageProxy.h"
 
-#include "PageClient.h"
-#include <WebCore/Language.h>
-#include <wtf/text/StringConcatenate.h>
+#import "PageClient.h"
+#import <WebCore/Language.h>
+#import <wtf/text/StringConcatenate.h>
 
 @interface NSApplication (Details)
 - (void)speakString:(NSString *)string;
index 481e8c5..cf26666 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WebPopupMenuProxyMac.h"
+#import "WebPopupMenuProxyMac.h"
 
-#include "PageClientImpl.h"
-#include "PlatformPopupMenuData.h"
-#include "WKView.h"
-#include "WebPopupItem.h"
-#include <WebKitSystemInterface.h>
+#import "PageClientImpl.h"
+#import "PlatformPopupMenuData.h"
+#import "WKView.h"
+#import "WebPopupItem.h"
+#import <WebKitSystemInterface.h>
 
 using namespace WebCore;
 
index b954bd2..97959ec 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WebPreferences.h"
+#import "WebPreferences.h"
 
-#include "PageClientImpl.h"
-#include <wtf/text/StringConcatenate.h>
+#import "PageClientImpl.h"
+#import <wtf/text/StringConcatenate.h>
 
 namespace WebKit {
 
index 6839020..765171e 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "Download.h"
-
-#include <WebCore/BackForwardController.h>
-#include <WebCore/HistoryItem.h>
-#include <WebCore/Page.h>
-#include <WebCore/ResourceHandle.h>
-#include <WebCore/ResourceResponse.h>
-#include "DataReference.h"
-#include "NotImplemented.h"
-#include "WebPage.h"
+#import "Download.h"
+
+#import <WebCore/BackForwardController.h>
+#import <WebCore/HistoryItem.h>
+#import <WebCore/Page.h>
+#import <WebCore/ResourceHandle.h>
+#import <WebCore/ResourceResponse.h>
+#import "DataReference.h"
+#import "NotImplemented.h"
+#import "WebPage.h"
 
 @interface NSURLDownload (WebNSURLDownloadDetails)
 +(id)_downloadWithLoadingConnection:(NSURLConnection *)connection
index d57e8d1..5e619f1 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "NetscapePlugin.h"
+#import "NetscapePlugin.h"
 
-#include "PluginController.h"
-#include "WebEvent.h"
-#include <WebCore/GraphicsContext.h>
-#include <Carbon/Carbon.h>
-#include <WebKitSystemInterface.h>
+#import "PluginController.h"
+#import "WebEvent.h"
+#import <WebCore/GraphicsContext.h>
+#import <Carbon/Carbon.h>
+#import <WebKitSystemInterface.h>
 
 using namespace WebCore;
 
index 6ecf7b9..05c4458 100644 (file)
@@ -25,9 +25,9 @@
 
 #if ENABLE(PLUGIN_PROCESS)
 
-#include "PluginProxy.h"
+#import "PluginProxy.h"
 
-#include <WebKitSystemInterface.h>
+#import <WebKitSystemInterface.h>
 
 namespace WebKit {
 
index 32d08b2..5056351 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WebContextMenuClient.h"
+#import "WebContextMenuClient.h"
 
-#include "NotImplemented.h"
-#include "WebPage.h"
-#include <WebCore/Frame.h>
-#include <WebCore/Page.h>
-#include <wtf/text/WTFString.h>
+#import "NotImplemented.h"
+#import "WebPage.h"
+#import <WebCore/Frame.h>
+#import <WebCore/Page.h>
+#import <wtf/text/WTFString.h>
 
 using namespace WebCore;
 
index d4eb3ac..a7b708a 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WebDatabaseManager.h"
+#import "WebDatabaseManager.h"
 
 namespace WebKit {
 
index ce33890..71aabc0 100644 (file)
 #import "WebEditorClient.h"
 
 #define DISABLE_NOT_IMPLEMENTED_WARNINGS 1
-#include "NotImplemented.h"
-
-#include "WebCoreArgumentCoders.h"
-#include "WebPage.h"
-#include "WebFrame.h"
-#include "WebPageProxyMessages.h"
-#include "WebProcess.h"
-#include <WebCore/ArchiveResource.h>
-#include <WebCore/DocumentFragment.h>
-#include <WebCore/DOMDocumentFragmentInternal.h>
-#include <WebCore/DOMDocumentInternal.h>
-#include <WebCore/FocusController.h>
-#include <WebCore/Frame.h>
-#include <WebCore/KeyboardEvent.h>
-#include <WebCore/Page.h>
-#include <WebKit/WebResource.h>
-#include <WebKit/WebNSURLExtras.h>
+#import "NotImplemented.h"
+
+#import "WebCoreArgumentCoders.h"
+#import "WebPage.h"
+#import "WebFrame.h"
+#import "WebPageProxyMessages.h"
+#import "WebProcess.h"
+#import <WebCore/ArchiveResource.h>
+#import <WebCore/DocumentFragment.h>
+#import <WebCore/DOMDocumentFragmentInternal.h>
+#import <WebCore/DOMDocumentInternal.h>
+#import <WebCore/FocusController.h>
+#import <WebCore/Frame.h>
+#import <WebCore/KeyboardEvent.h>
+#import <WebCore/Page.h>
+#import <WebKit/WebResource.h>
+#import <WebKit/WebNSURLExtras.h>
 #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 #import <AppKit/NSTextChecker.h>
 #endif
index 549d7ee..55e0398 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WebErrors.h"
+#import "WebErrors.h"
 
-#include "WKError.h"
-#include "WebError.h"
-#include <WebCore/ResourceRequest.h>
-#include <WebCore/ResourceResponse.h>
-#include <pthread.h>
+#import "WKError.h"
+#import "WebError.h"
+#import <WebCore/ResourceRequest.h>
+#import <WebCore/ResourceResponse.h>
+#import <pthread.h>
 
 using namespace WebCore;
 using namespace WebKit;
index 4d3d167..9d99191 100644 (file)
@@ -23,9 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WebPopupMenu.h"
+#import "WebPopupMenu.h"
 
-#include "PlatformPopupMenuData.h"
+#import "PlatformPopupMenuData.h"
 
 using namespace WebCore;
 
index 24fa124..4697c3b 100644 (file)
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "LayerBackedDrawingArea.h"
-
-#include "DrawingAreaProxyMessageKinds.h"
-#include "WebKitSystemInterface.h"
-#include "WebPage.h"
-#include "WebProcess.h"
-#include <WebCore/Frame.h>
-#include <WebCore/FrameView.h>
-#include <WebCore/GraphicsLayer.h>
-#include <WebCore/Page.h>
+#import "LayerBackedDrawingArea.h"
+
+#import "DrawingAreaProxyMessageKinds.h"
+#import "WebKitSystemInterface.h"
+#import "WebPage.h"
+#import "WebProcess.h"
+#import <WebCore/Frame.h>
+#import <WebCore/FrameView.h>
+#import <WebCore/GraphicsLayer.h>
+#import <WebCore/Page.h>
 
 using namespace WebCore;
 
index f3211f2..b6ec190 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WebPage.h"
+#import "WebPage.h"
 
-#include "AccessibilityWebPageObject.h"
-#include "DataReference.h"
-#include "PluginView.h"
-#include "WebCoreArgumentCoders.h"
-#include "WebEvent.h"
-#include "WebFrame.h"
-#include "WebPageProxyMessages.h"
-#include "WebProcess.h"
-#include <WebCore/AXObjectCache.h>
-#include <WebCore/FocusController.h>
-#include <WebCore/Frame.h>
-#include <WebCore/FrameView.h>
-#include <WebCore/HitTestResult.h>
-#include <WebCore/KeyboardEvent.h>
-#include <WebCore/Page.h>
-#include <WebCore/PlatformKeyboardEvent.h>
-#include <WebCore/ScrollView.h>
-#include <WebCore/TextIterator.h>
-#include <WebCore/WindowsKeyboardCodes.h>
-#include <WebKitSystemInterface.h>
+#import "AccessibilityWebPageObject.h"
+#import "DataReference.h"
+#import "PluginView.h"
+#import "WebCoreArgumentCoders.h"
+#import "WebEvent.h"
+#import "WebFrame.h"
+#import "WebPageProxyMessages.h"
+#import "WebProcess.h"
+#import <WebCore/AXObjectCache.h>
+#import <WebCore/FocusController.h>
+#import <WebCore/Frame.h>
+#import <WebCore/FrameView.h>
+#import <WebCore/HitTestResult.h>
+#import <WebCore/KeyboardEvent.h>
+#import <WebCore/Page.h>
+#import <WebCore/PlatformKeyboardEvent.h>
+#import <WebCore/ScrollView.h>
+#import <WebCore/TextIterator.h>
+#import <WebCore/WindowsKeyboardCodes.h>
+#import <WebKitSystemInterface.h>
 
 using namespace WebCore;
 
index d394c98..80ff722 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WebProcess.h"
-
-#include "SandboxExtension.h"
-#include "WebProcessCreationParameters.h"
-#include <WebCore/MemoryCache.h>
-#include <WebCore/PageCache.h>
-#include <WebKitSystemInterface.h>
-#include <algorithm>
-#include <dispatch/dispatch.h>
-#include <mach/host_info.h>
-#include <mach/mach.h>
-#include <mach/mach_error.h>
+#import "WebProcess.h"
+
+#import "SandboxExtension.h"
+#import "WebProcessCreationParameters.h"
+#import <WebCore/MemoryCache.h>
+#import <WebCore/PageCache.h>
+#import <WebKitSystemInterface.h>
+#import <algorithm>
+#import <dispatch/dispatch.h>
+#import <mach/host_info.h>
+#import <mach/mach.h>
+#import <mach/mach_error.h>
 
 #if ENABLE(WEB_PROCESS_SANDBOX)
-#include <sandbox.h>
-#include <stdlib.h>
-#include <sysexits.h>
+#import <sandbox.h>
+#import <stdlib.h>
+#import <sysexits.h>
 #endif
 
 using namespace WebCore;