From f0c7ad4d9de932871e5e01c463a25c02db140b99 Mon Sep 17 00:00:00 2001 From: Fujii Hironori Date: Sun, 9 Apr 2023 23:06:11 -0700 Subject: [PATCH] wtf/Process.h is conflicting with process.h on Windows https://bugs.webkit.org/show_bug.cgi?id=255214 Reviewed by Ross Kirsling. After 262760@main (bug#255199) added wtf/Process.h, Windows port can't compile. > ThreadingWin.cpp(158): error C3861: '_beginthreadex': identifier not found Windows has process.h. Renamed Process.h to WTFProcess.h. * Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp: * Source/JavaScriptCore/API/tests/testapi.mm: * Source/JavaScriptCore/assembler/testmasm.cpp: * Source/JavaScriptCore/b3/air/testair.cpp: * Source/JavaScriptCore/b3/testb3.h: * Source/JavaScriptCore/dfg/testdfg.cpp: * Source/JavaScriptCore/jsc.cpp: * Source/JavaScriptCore/runtime/ResourceExhaustion.cpp: * Source/JavaScriptCore/testRegExp.cpp: * Source/JavaScriptCore/tools/FunctionOverrides.cpp: * Source/JavaScriptCore/tools/JSDollarVM.cpp: * Source/WTF/WTF.xcodeproj/project.pbxproj: * Source/WTF/wtf/CMakeLists.txt: * Source/WTF/wtf/WTFProcess.cpp: Renamed from Source/WTF/wtf/Process.cpp. * Source/WTF/wtf/WTFProcess.h: Renamed from Source/WTF/wtf/Process.h. * Source/WebCore/workers/service/context/SWContextManager.cpp: * Source/WebGPU/WGSL/wgslc.cpp: * Source/WebKit/NetworkProcess/NetworkProcess.cpp: * Source/WebKit/Platform/IPC/Connection.cpp: * Source/WebKit/Shared/AuxiliaryProcess.cpp: * Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h: * Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm: * Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm: * Source/WebKit/Shared/IPCStreamTester.cpp: * Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm: * Source/WebKit/WebProcess/WebProcess.cpp: * Source/WebKit/webpushd/WebPushDaemonMain.mm: * Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm: * Tools/DumpRenderTree/mac/DumpRenderTree.mm: * Tools/WebKitTestRunner/TestController.cpp: * Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp: * Tools/WebKitTestRunner/win/TestControllerWin.cpp: * Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp: Canonical link: https://commits.webkit.org/262762@main --- .../API/tests/ExecutionTimeLimitTest.cpp | 2 +- Source/JavaScriptCore/API/tests/testapi.mm | 2 +- Source/JavaScriptCore/assembler/testmasm.cpp | 2 +- Source/JavaScriptCore/b3/air/testair.cpp | 2 +- Source/JavaScriptCore/b3/testb3.h | 2 +- Source/JavaScriptCore/dfg/testdfg.cpp | 2 +- Source/JavaScriptCore/jsc.cpp | 2 +- .../runtime/ResourceExhaustion.cpp | 2 +- Source/JavaScriptCore/testRegExp.cpp | 2 +- .../JavaScriptCore/tools/FunctionOverrides.cpp | 2 +- Source/JavaScriptCore/tools/JSDollarVM.cpp | 2 +- Source/WTF/WTF.xcodeproj/project.pbxproj | 16 ++++++++-------- Source/WTF/wtf/CMakeLists.txt | 4 ++-- Source/WTF/wtf/{Process.cpp => WTFProcess.cpp} | 2 +- Source/WTF/wtf/{Process.h => WTFProcess.h} | 0 .../workers/service/context/SWContextManager.cpp | 2 +- Source/WebGPU/WGSL/wgslc.cpp | 2 +- Source/WebKit/NetworkProcess/NetworkProcess.cpp | 2 +- Source/WebKit/Platform/IPC/Connection.cpp | 2 +- Source/WebKit/Shared/AuxiliaryProcess.cpp | 2 +- .../Cocoa/XPCService/XPCServiceEntryPoint.h | 2 +- .../Cocoa/XPCService/XPCServiceEntryPoint.mm | 2 +- .../Cocoa/XPCService/XPCServiceMain.mm | 2 +- Source/WebKit/Shared/IPCStreamTester.cpp | 2 +- Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm | 2 +- Source/WebKit/WebProcess/WebProcess.cpp | 2 +- Source/WebKit/webpushd/WebPushDaemonMain.mm | 2 +- .../webpushd/webpushtool/WebPushToolMain.mm | 2 +- Tools/DumpRenderTree/mac/DumpRenderTree.mm | 2 +- Tools/WebKitTestRunner/TestController.cpp | 2 +- Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp | 2 +- Tools/WebKitTestRunner/win/TestControllerWin.cpp | 2 +- Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp | 2 +- 33 files changed, 40 insertions(+), 40 deletions(-) rename Source/WTF/wtf/{Process.cpp => WTFProcess.cpp} (99%) rename Source/WTF/wtf/{Process.h => WTFProcess.h} (100%) diff --git a/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp b/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp index 778546143a57..23d8714ed55b 100644 --- a/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp +++ b/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp @@ -33,8 +33,8 @@ #include #include #include -#include #include +#include #include #if HAVE(MACH_EXCEPTIONS) diff --git a/Source/JavaScriptCore/API/tests/testapi.mm b/Source/JavaScriptCore/API/tests/testapi.mm index b96d7de9360c..34ecebc00d7e 100644 --- a/Source/JavaScriptCore/API/tests/testapi.mm +++ b/Source/JavaScriptCore/API/tests/testapi.mm @@ -39,8 +39,8 @@ #import "JSWrapperMapTests.h" #import "Regress141275.h" #import "Regress141809.h" -#import #import +#import #import diff --git a/Source/JavaScriptCore/assembler/testmasm.cpp b/Source/JavaScriptCore/assembler/testmasm.cpp index 642de7ff92ef..5571c7ccd0b1 100644 --- a/Source/JavaScriptCore/assembler/testmasm.cpp +++ b/Source/JavaScriptCore/assembler/testmasm.cpp @@ -39,9 +39,9 @@ #include #include #include -#include #include #include +#include #include // We don't have a NO_RETURN_DUE_TO_EXIT, nor should we. That's ridiculous. diff --git a/Source/JavaScriptCore/b3/air/testair.cpp b/Source/JavaScriptCore/b3/air/testair.cpp index ebc0bea717b7..3b5a72e6c1c5 100644 --- a/Source/JavaScriptCore/b3/air/testair.cpp +++ b/Source/JavaScriptCore/b3/air/testair.cpp @@ -45,9 +45,9 @@ #include #include #include -#include #include #include +#include #include // We don't have a NO_RETURN_DUE_TO_EXIT, nor should we. That's ridiculous. diff --git a/Source/JavaScriptCore/b3/testb3.h b/Source/JavaScriptCore/b3/testb3.h index eebaba2ce6c9..25ba9a4263a6 100644 --- a/Source/JavaScriptCore/b3/testb3.h +++ b/Source/JavaScriptCore/b3/testb3.h @@ -77,9 +77,9 @@ #include #include #include -#include #include #include +#include #include // We don't have a NO_RETURN_DUE_TO_EXIT, nor should we. That's ridiculous. diff --git a/Source/JavaScriptCore/dfg/testdfg.cpp b/Source/JavaScriptCore/dfg/testdfg.cpp index aa0e4b136516..77c49676ba41 100644 --- a/Source/JavaScriptCore/dfg/testdfg.cpp +++ b/Source/JavaScriptCore/dfg/testdfg.cpp @@ -30,7 +30,7 @@ #include "DFGAbstractValue.h" #include "InitializeThreading.h" #include -#include +#include #include // We don't have a NO_RETURN_DUE_TO_EXIT, nor should we. That's ridiculous. diff --git a/Source/JavaScriptCore/jsc.cpp b/Source/JavaScriptCore/jsc.cpp index 91e91f796244..9d1175b03ba4 100644 --- a/Source/JavaScriptCore/jsc.cpp +++ b/Source/JavaScriptCore/jsc.cpp @@ -92,12 +92,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include #include diff --git a/Source/JavaScriptCore/runtime/ResourceExhaustion.cpp b/Source/JavaScriptCore/runtime/ResourceExhaustion.cpp index 5bceed869774..bdedc9d751dc 100644 --- a/Source/JavaScriptCore/runtime/ResourceExhaustion.cpp +++ b/Source/JavaScriptCore/runtime/ResourceExhaustion.cpp @@ -28,7 +28,7 @@ #include "Options.h" #include -#include +#include namespace JSC { diff --git a/Source/JavaScriptCore/testRegExp.cpp b/Source/JavaScriptCore/testRegExp.cpp index af45c7d7295b..137083c91651 100644 --- a/Source/JavaScriptCore/testRegExp.cpp +++ b/Source/JavaScriptCore/testRegExp.cpp @@ -28,8 +28,8 @@ #include #include #include -#include #include +#include #include #if COMPILER(MSVC) diff --git a/Source/JavaScriptCore/tools/FunctionOverrides.cpp b/Source/JavaScriptCore/tools/FunctionOverrides.cpp index 7f8770b183d7..4e39509c3ad8 100644 --- a/Source/JavaScriptCore/tools/FunctionOverrides.cpp +++ b/Source/JavaScriptCore/tools/FunctionOverrides.cpp @@ -31,8 +31,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/Source/JavaScriptCore/tools/JSDollarVM.cpp b/Source/JavaScriptCore/tools/JSDollarVM.cpp index d49ceec04b3a..f02b88232dd1 100644 --- a/Source/JavaScriptCore/tools/JSDollarVM.cpp +++ b/Source/JavaScriptCore/tools/JSDollarVM.cpp @@ -64,9 +64,9 @@ #include #include #include -#include #include #include +#include #include #if !USE(SYSTEM_MALLOC) diff --git a/Source/WTF/WTF.xcodeproj/project.pbxproj b/Source/WTF/WTF.xcodeproj/project.pbxproj index 043d137bd541..893caff0256a 100644 --- a/Source/WTF/WTF.xcodeproj/project.pbxproj +++ b/Source/WTF/WTF.xcodeproj/project.pbxproj @@ -815,8 +815,8 @@ E361DB67289115D000B2A2B8 /* fast_table.h in Headers */ = {isa = PBXBuildFile; fileRef = E361DB5E289115D000B2A2B8 /* fast_table.h */; }; E361DB68289115D000B2A2B8 /* digit_comparison.h in Headers */ = {isa = PBXBuildFile; fileRef = E361DB5F289115D000B2A2B8 /* digit_comparison.h */; }; E361DB69289115D000B2A2B8 /* bigint.h in Headers */ = {isa = PBXBuildFile; fileRef = E361DB60289115D000B2A2B8 /* bigint.h */; }; - E36BA9DE29E275DB00300057 /* Process.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E36BA9DC29E275DB00300057 /* Process.cpp */; }; - E36BA9DF29E275DB00300057 /* Process.h in Headers */ = {isa = PBXBuildFile; fileRef = E36BA9DD29E275DB00300057 /* Process.h */; settings = {ATTRIBUTES = (Private, ); }; }; + E36BA9DE29E275DB00300057 /* WTFProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E36BA9DC29E275DB00300057 /* WTFProcess.cpp */; }; + E36BA9DF29E275DB00300057 /* WTFProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = E36BA9DD29E275DB00300057 /* WTFProcess.h */; settings = {ATTRIBUTES = (Private, ); }; }; E37E96542702AD0B00E1C36A /* ApproximateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E37E96522702AD0700E1C36A /* ApproximateTime.cpp */; }; E388886F20C9095100E632BC /* WorkerPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E388886D20C9095100E632BC /* WorkerPool.cpp */; }; E38C41281EB4E0680042957D /* CPUTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38C41261EB4E0680042957D /* CPUTime.cpp */; }; @@ -1719,8 +1719,8 @@ E361DB60289115D000B2A2B8 /* bigint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bigint.h; sourceTree = ""; }; E36895CB23A445CD008DD4C8 /* PackedRef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PackedRef.h; sourceTree = ""; }; E36895CC23A445EE008DD4C8 /* PackedRefPtr.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PackedRefPtr.h; sourceTree = ""; }; - E36BA9DC29E275DB00300057 /* Process.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Process.cpp; sourceTree = ""; }; - E36BA9DD29E275DB00300057 /* Process.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Process.h; sourceTree = ""; }; + E36BA9DC29E275DB00300057 /* WTFProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WTFProcess.cpp; sourceTree = ""; }; + E36BA9DD29E275DB00300057 /* WTFProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WTFProcess.h; sourceTree = ""; }; E37E96522702AD0700E1C36A /* ApproximateTime.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ApproximateTime.cpp; sourceTree = ""; }; E37E96532702AD0700E1C36A /* ApproximateTime.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ApproximateTime.h; sourceTree = ""; }; E38020DB2401C0930037CA9E /* CompactRefPtrTuple.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CompactRefPtrTuple.h; sourceTree = ""; }; @@ -2228,8 +2228,6 @@ 0F9D335D165DBA73005AD387 /* PrintStream.cpp */, 0F9D335E165DBA73005AD387 /* PrintStream.h */, 53EC253C1E95AD30000831B9 /* PriorityQueue.h */, - E36BA9DC29E275DB00300057 /* Process.cpp */, - E36BA9DD29E275DB00300057 /* Process.h */, 0FC4488216FE9FE100844BE9 /* ProcessID.h */, 7AF023B42061E16F00A8EFD6 /* ProcessPrivilege.cpp */, 7AF023B32061E16C00A8EFD6 /* ProcessPrivilege.h */, @@ -2400,6 +2398,8 @@ FE05FAFE1FE5007500093230 /* WTFAssertions.cpp */, FE032AD02463E43B0012D7C7 /* WTFConfig.cpp */, FE032AD12463E43B0012D7C7 /* WTFConfig.h */, + E36BA9DC29E275DB00300057 /* WTFProcess.cpp */, + E36BA9DD29E275DB00300057 /* WTFProcess.h */, A36E16F7216FF828008DD87E /* WTFSemaphore.h */, ); path = wtf; @@ -3193,7 +3193,6 @@ DD3DC96F27A4BF8E007E5B61 /* PointerPreparations.h in Headers */, DD3DC93227A4BF8E007E5B61 /* PrintStream.h in Headers */, DD3DC95027A4BF8E007E5B61 /* PriorityQueue.h in Headers */, - E36BA9DF29E275DB00300057 /* Process.h in Headers */, DD3DC89927A4BF8E007E5B61 /* ProcessID.h in Headers */, DDF306E827C08654006A526F /* ProcessMemoryFootprint.h in Headers */, DD3DC95627A4BF8E007E5B61 /* ProcessPrivilege.h in Headers */, @@ -3370,6 +3369,7 @@ DD3DC92327A4BF8E007E5B61 /* WorkerPool.h in Headers */, DD3DC88527A4BF8E007E5B61 /* WorkQueue.h in Headers */, DD3DC8FF27A4BF8E007E5B61 /* WTFConfig.h in Headers */, + E36BA9DF29E275DB00300057 /* WTFProcess.h in Headers */, DD3DC97D27A4BF8E007E5B61 /* WTFSemaphore.h in Headers */, DDF307C227C086DF006A526F /* WTFString.h in Headers */, DDF306EA27C08654006A526F /* XPCSPI.h in Headers */, @@ -3756,7 +3756,6 @@ 51F1752D1F3D486000C74950 /* PersistentEncoder.cpp in Sources */, FE1E2C42224187C600F6B729 /* PlatformRegisters.cpp in Sources */, 0F9D3362165DBA73005AD387 /* PrintStream.cpp in Sources */, - E36BA9DE29E275DB00300057 /* Process.cpp in Sources */, 7AF023B52061E17000A8EFD6 /* ProcessPrivilege.cpp in Sources */, FE1E2C3B2240C06600F6B729 /* PtrTag.cpp in Sources */, 143F611F1565F0F900DB514A /* RAMSize.cpp in Sources */, @@ -3835,6 +3834,7 @@ E4A0AD3D1A96253C00536DF6 /* WorkQueueCocoa.cpp in Sources */, FE05FAFF1FE5007500093230 /* WTFAssertions.cpp in Sources */, FE032AD22463E43B0012D7C7 /* WTFConfig.cpp in Sources */, + E36BA9DE29E275DB00300057 /* WTFProcess.cpp in Sources */, A8A47445151A825B004123FF /* WTFString.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt index 3541f62fd065..4bfaab1a7c39 100644 --- a/Source/WTF/wtf/CMakeLists.txt +++ b/Source/WTF/wtf/CMakeLists.txt @@ -212,7 +212,6 @@ set(WTF_PUBLIC_HEADERS PointerPreparations.h PrintStream.h PriorityQueue.h - Process.h ProcessID.h ProcessPrivilege.h PtrTag.h @@ -327,6 +326,7 @@ set(WTF_PUBLIC_HEADERS VectorHash.h VectorTraits.h WTFConfig.h + WTFProcess.h WTFSemaphore.h WallTime.h WeakHashCountedSet.h @@ -483,7 +483,6 @@ set(WTF_SOURCES ParallelJobsGeneric.cpp ParkingLot.cpp PrintStream.cpp - Process.cpp ProcessPrivilege.cpp RAMSize.cpp RandomDevice.cpp @@ -517,6 +516,7 @@ set(WTF_SOURCES Vector.cpp WTFAssertions.cpp WTFConfig.cpp + WTFProcess.cpp WallTime.cpp WeakPtr.cpp WeakRandomNumber.cpp diff --git a/Source/WTF/wtf/Process.cpp b/Source/WTF/wtf/WTFProcess.cpp similarity index 99% rename from Source/WTF/wtf/Process.cpp rename to Source/WTF/wtf/WTFProcess.cpp index 25acdfa15710..7d01fe9cd057 100644 --- a/Source/WTF/wtf/Process.cpp +++ b/Source/WTF/wtf/WTFProcess.cpp @@ -24,7 +24,7 @@ */ #include "config.h" -#include +#include #include diff --git a/Source/WTF/wtf/Process.h b/Source/WTF/wtf/WTFProcess.h similarity index 100% rename from Source/WTF/wtf/Process.h rename to Source/WTF/wtf/WTFProcess.h diff --git a/Source/WebCore/workers/service/context/SWContextManager.cpp b/Source/WebCore/workers/service/context/SWContextManager.cpp index 541d3b9b7604..0b66b95cdbf5 100644 --- a/Source/WebCore/workers/service/context/SWContextManager.cpp +++ b/Source/WebCore/workers/service/context/SWContextManager.cpp @@ -31,7 +31,7 @@ #include "Logging.h" #include "MessageWithMessagePorts.h" #include "ServiceWorkerGlobalScope.h" -#include +#include namespace WebCore { diff --git a/Source/WebGPU/WGSL/wgslc.cpp b/Source/WebGPU/WGSL/wgslc.cpp index 424474fe3f6c..4464b0f34766 100644 --- a/Source/WebGPU/WGSL/wgslc.cpp +++ b/Source/WebGPU/WGSL/wgslc.cpp @@ -30,7 +30,7 @@ #include "WGSLShaderModule.h" #include #include -#include +#include static NO_RETURN void printUsageStatement(bool help = false) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp index b2fd6d976268..b14026232ff3 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -92,11 +92,11 @@ #include #include #include -#include #include #include #include #include +#include #include #if ENABLE(SEC_ITEM_SHIM) diff --git a/Source/WebKit/Platform/IPC/Connection.cpp b/Source/WebKit/Platform/IPC/Connection.cpp index 036269f2cd01..3c8bfec9ef2f 100644 --- a/Source/WebKit/Platform/IPC/Connection.cpp +++ b/Source/WebKit/Platform/IPC/Connection.cpp @@ -36,9 +36,9 @@ #include #include #include -#include #include #include +#include #include #include diff --git a/Source/WebKit/Shared/AuxiliaryProcess.cpp b/Source/WebKit/Shared/AuxiliaryProcess.cpp index 205ccaec4369..1ecff7b62f65 100644 --- a/Source/WebKit/Shared/AuxiliaryProcess.cpp +++ b/Source/WebKit/Shared/AuxiliaryProcess.cpp @@ -35,8 +35,8 @@ #include #include #include -#include #include +#include #if !OS(WINDOWS) #include diff --git a/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h b/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h index fc69059c6ed2..3e3ddf57d82e 100644 --- a/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h +++ b/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h @@ -29,7 +29,7 @@ #import "WebKit2Initialize.h" #import #import -#import +#import #import #if !USE(RUNNINGBOARD) diff --git a/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm b/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm index b335abf163d9..85c35fddd8a6 100644 --- a/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm +++ b/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm @@ -30,7 +30,7 @@ #import "XPCServiceEntryPoint.h" #import #import -#import +#import #import #import #import diff --git a/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm b/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm index 227c72957fb8..c62441db37a7 100644 --- a/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm +++ b/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm @@ -37,8 +37,8 @@ #import #import #import -#import #import +#import #import #import #import diff --git a/Source/WebKit/Shared/IPCStreamTester.cpp b/Source/WebKit/Shared/IPCStreamTester.cpp index 0e79bddacb88..6e1826e5e98f 100644 --- a/Source/WebKit/Shared/IPCStreamTester.cpp +++ b/Source/WebKit/Shared/IPCStreamTester.cpp @@ -26,7 +26,7 @@ #include "config.h" #include "IPCStreamTester.h" -#include +#include #if ENABLE(IPC_TESTING_API) #include "Decoder.h" diff --git a/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm b/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm index 1b939086b2c5..3de7df01b258 100644 --- a/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm +++ b/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm @@ -50,11 +50,11 @@ #import #import #import -#import #import #import #import #import +#import #import #import #import diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp index 24ac76a52bca..2aef4e300fa0 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -149,11 +149,11 @@ #include #include #include -#include #include #include #include #include +#include #include #include diff --git a/Source/WebKit/webpushd/WebPushDaemonMain.mm b/Source/WebKit/webpushd/WebPushDaemonMain.mm index ebfd1173c175..d0497f222b77 100644 --- a/Source/WebKit/webpushd/WebPushDaemonMain.mm +++ b/Source/WebKit/webpushd/WebPushDaemonMain.mm @@ -40,7 +40,7 @@ #import #import #import -#import +#import #import using WebKit::Daemon::EncodedMessage; diff --git a/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm b/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm index 5789fc07ae3c..dd98a43985c5 100644 --- a/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm +++ b/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm @@ -29,7 +29,7 @@ #import #import #import -#import +#import using WebKit::WebPushD::PushMessageForTesting; diff --git a/Tools/DumpRenderTree/mac/DumpRenderTree.mm b/Tools/DumpRenderTree/mac/DumpRenderTree.mm index 95cc360ef296..8a4270b798a3 100644 --- a/Tools/DumpRenderTree/mac/DumpRenderTree.mm +++ b/Tools/DumpRenderTree/mac/DumpRenderTree.mm @@ -98,11 +98,11 @@ #import #import #import -#import #import #import #import #import +#import #import #import #import diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp index 25ef4771b0d0..6ccb1a88fb62 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp @@ -87,7 +87,6 @@ #include #include #include -#include #include #include #include @@ -95,6 +94,7 @@ #include #include #include +#include #include #include diff --git a/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp b/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp index 63e25564a176..deb960d39fca 100644 --- a/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp +++ b/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp @@ -32,8 +32,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/Tools/WebKitTestRunner/win/TestControllerWin.cpp b/Tools/WebKitTestRunner/win/TestControllerWin.cpp index 84f54368c46b..c685fe5a353e 100644 --- a/Tools/WebKitTestRunner/win/TestControllerWin.cpp +++ b/Tools/WebKitTestRunner/win/TestControllerWin.cpp @@ -34,8 +34,8 @@ #include #include #include -#include #include +#include #define INJECTED_BUNDLE_DLL_NAME "TestRunnerInjectedBundle.dll" diff --git a/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp b/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp index 6800fde91044..6e30560974f4 100644 --- a/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp +++ b/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp @@ -29,8 +29,8 @@ #include "PlatformWebView.h" #include #include -#include #include +#include #include #include