[Win] WebCore/platform/Process.h is conflicting with process.h
authorHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 29 Jan 2019 05:58:00 +0000 (05:58 +0000)
committerHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 29 Jan 2019 05:58:00 +0000 (05:58 +0000)
https://bugs.webkit.org/show_bug.cgi?id=193944

Reviewed by Ross Kirsling.

Source/WebCore:

Windows has process.h. Rename Process.h to ProcessIdentifier.h.

No new tests because there is no behavior change.

* Sources.txt:
* UnifiedSources-input.xcfilelist:
* WebCore.xcodeproj/project.pbxproj:
* dom/MessagePortIdentifier.h:
* dom/messageports/MessagePortChannel.h:
* dom/messageports/MessagePortChannelProvider.h:
* dom/messageports/MessagePortChannelRegistry.h:
* history/BackForwardItemIdentifier.h:
* page/GlobalWindowIdentifier.h:
* platform/ProcessIdentifier.cpp: Renamed from Source/WebCore/platform/Process.cpp.
(WebCore::Process::setIdentifier):
(WebCore::Process::identifier):
* platform/ProcessIdentifier.h: Renamed from Source/WebCore/platform/Process.h.

Source/WebKit:

* Shared/ChildProcess.h:
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm:
* Shared/unix/ChildProcessMain.cpp:
* UIProcess/API/APINavigation.h:
* UIProcess/ChildProcessProxy.h:
* UIProcess/Launcher/ProcessLauncher.h:
* UIProcess/WebProcessPool.cpp:
* UIProcess/WebProcessProxy.h:

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

21 files changed:
Source/WebCore/ChangeLog
Source/WebCore/Sources.txt
Source/WebCore/UnifiedSources-input.xcfilelist
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/dom/MessagePortIdentifier.h
Source/WebCore/dom/messageports/MessagePortChannel.h
Source/WebCore/dom/messageports/MessagePortChannelProvider.h
Source/WebCore/dom/messageports/MessagePortChannelRegistry.h
Source/WebCore/history/BackForwardItemIdentifier.h
Source/WebCore/page/GlobalWindowIdentifier.h
Source/WebCore/platform/ProcessIdentifier.cpp [moved from Source/WebCore/platform/Process.cpp with 98% similarity]
Source/WebCore/platform/ProcessIdentifier.h [moved from Source/WebCore/platform/Process.h with 100% similarity]
Source/WebKit/ChangeLog
Source/WebKit/Shared/ChildProcess.h
Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
Source/WebKit/Shared/unix/ChildProcessMain.cpp
Source/WebKit/UIProcess/API/APINavigation.h
Source/WebKit/UIProcess/ChildProcessProxy.h
Source/WebKit/UIProcess/Launcher/ProcessLauncher.h
Source/WebKit/UIProcess/WebProcessPool.cpp
Source/WebKit/UIProcess/WebProcessProxy.h

index c7f7179..f728566 100644 (file)
@@ -1,3 +1,28 @@
+2019-01-28  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win] WebCore/platform/Process.h is conflicting with process.h
+        https://bugs.webkit.org/show_bug.cgi?id=193944
+
+        Reviewed by Ross Kirsling.
+
+        Windows has process.h. Rename Process.h to ProcessIdentifier.h.
+
+        No new tests because there is no behavior change.
+
+        * Sources.txt:
+        * UnifiedSources-input.xcfilelist:
+        * WebCore.xcodeproj/project.pbxproj:
+        * dom/MessagePortIdentifier.h:
+        * dom/messageports/MessagePortChannel.h:
+        * dom/messageports/MessagePortChannelProvider.h:
+        * dom/messageports/MessagePortChannelRegistry.h:
+        * history/BackForwardItemIdentifier.h:
+        * page/GlobalWindowIdentifier.h:
+        * platform/ProcessIdentifier.cpp: Renamed from Source/WebCore/platform/Process.cpp.
+        (WebCore::Process::setIdentifier):
+        (WebCore::Process::identifier):
+        * platform/ProcessIdentifier.h: Renamed from Source/WebCore/platform/Process.h.
+
 2019-01-28  Antoine Quint  <graouts@apple.com>
 
         Implement capture for Pointer Events on iOS
index cb5143d..fd0568f 100644 (file)
@@ -1628,7 +1628,7 @@ platform/PlatformSpeechSynthesisUtterance.cpp
 platform/PlatformSpeechSynthesisVoice.cpp
 platform/PlatformSpeechSynthesizer.cpp
 platform/PlatformStrategies.cpp
-platform/Process.cpp
+platform/ProcessIdentifier.cpp
 platform/ReferrerPolicy.cpp
 platform/RemoteCommandListener.cpp
 platform/RuntimeApplicationChecks.cpp
index 379a473..3e54fef 100644 (file)
@@ -2629,7 +2629,7 @@ $(SRCROOT)/platform/PlatformSpeechSynthesisUtterance.cpp
 $(SRCROOT)/platform/PlatformSpeechSynthesisVoice.cpp
 $(SRCROOT)/platform/PlatformSpeechSynthesizer.cpp
 $(SRCROOT)/platform/PlatformStrategies.cpp
-$(SRCROOT)/platform/Process.cpp
+$(SRCROOT)/platform/ProcessIdentifier.cpp
 $(SRCROOT)/platform/ReferrerPolicy.cpp
 $(SRCROOT)/platform/RemoteCommandListener.cpp
 $(SRCROOT)/platform/RuntimeApplicationChecks.cpp
index 4a22387..cd7294d 100644 (file)
                51F645951F4A686100B54DED /* SWServerRegistration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SWServerRegistration.cpp; sourceTree = "<group>"; };
                51F645A01F4BF51600B54DED /* ServiceWorkerRegistrationOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ServiceWorkerRegistrationOptions.cpp; sourceTree = "<group>"; };
                51F645A31F4C000C00B54DED /* ExceptionData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExceptionData.cpp; sourceTree = "<group>"; };
-               51F645D21FECDBC800B54DED /* Process.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Process.cpp; sourceTree = "<group>"; };
-               51F645D31FECDBC800B54DED /* Process.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Process.h; sourceTree = "<group>"; };
+               51F645D21FECDBC800B54DED /* ProcessIdentifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessIdentifier.cpp; sourceTree = "<group>"; };
+               51F645D31FECDBC800B54DED /* ProcessIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessIdentifier.h; sourceTree = "<group>"; };
                51F645DE1FF4594B00B54DED /* MessagePortIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessagePortIdentifier.h; sourceTree = "<group>"; };
                51F6A3D50663BF04004D2919 /* HTMLCanvasElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLCanvasElement.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                51F6A3D60663BF04004D2919 /* HTMLCanvasElement.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HTMLCanvasElement.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                29A812040FBB9B4100510293 /* accessibility */ = {
                        isa = PBXGroup;
                        children = (
-                               29AE212921AB9ECB00869283 /* isolatedtree */,
                                AAA728EF16D1D8BC00D3BBC6 /* ios */,
+                               29AE212921AB9ECB00869283 /* isolatedtree */,
                                29A812050FBB9B5200510293 /* mac */,
                                2981CA9D131822EC00D12F2A /* AccessibilityARIAGrid.cpp */,
                                29A812160FBB9C1D00510293 /* AccessibilityARIAGrid.h */,
                29AE212921AB9ECB00869283 /* isolatedtree */ = {
                        isa = PBXGroup;
                        children = (
-                               29AE212B21AB9EEB00869283 /* AXIsolatedTree.h */,
                                29AE212C21AB9EEB00869283 /* AXIsolatedTree.cpp */,
-                               29AE213321ABA48A00869283 /* AXIsolatedTreeNode.h */,
+                               29AE212B21AB9EEB00869283 /* AXIsolatedTree.h */,
                                29AE213421ABA48A00869283 /* AXIsolatedTreeNode.cpp */,
+                               29AE213321ABA48A00869283 /* AXIsolatedTreeNode.h */,
                        );
                        path = isolatedtree;
                        sourceTree = "<group>";
                                0668E1890ADD9624004128E0 /* PopupMenu.h */,
                                ABC128760B33AA6D00C693D5 /* PopupMenuClient.h */,
                                BC3BE12A0E98092F00835588 /* PopupMenuStyle.h */,
-                               51F645D21FECDBC800B54DED /* Process.cpp */,
-                               51F645D31FECDBC800B54DED /* Process.h */,
+                               51F645D21FECDBC800B54DED /* ProcessIdentifier.cpp */,
+                               51F645D31FECDBC800B54DED /* ProcessIdentifier.h */,
                                F47A633C1FF6FD500081B3CC /* PromisedAttachmentInfo.h */,
                                0081FEFD16B0A244008AAA7A /* PublicSuffix.h */,
                                5C97A3361F5F7A6500105207 /* RectEdges.h */,
                                76CDD2F51103DA6600680521 /* AccessibilityMenuListPopup.h in Headers */,
                                29ACB212143E7128006BCA5F /* AccessibilityMockObject.h in Headers */,
                                29A812360FBB9C1D00510293 /* AccessibilityObject.h in Headers */,
+                               2936BF5C21D69E4B004A8FC9 /* AccessibilityObjectInterface.h in Headers */,
                                A409C985116D0DDD007197BD /* AccessibilityProgressIndicator.h in Headers */,
                                29A812390FBB9C1D00510293 /* AccessibilityRenderObject.h in Headers */,
                                93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */,
                                07F4E93320B3587F002E3803 /* AVFoundationMIMETypeCache.h in Headers */,
                                CD336F6217F9F64700DDDCD0 /* AVTrackPrivateAVFObjCImpl.h in Headers */,
                                070363E6181A1CDC00C074A5 /* AVVideoCaptureSource.h in Headers */,
+                               29AE212D21AB9EEB00869283 /* AXIsolatedTree.h in Headers */,
+                               29AE213521ABA48A00869283 /* AXIsolatedTreeNode.h in Headers */,
                                F45C231E1995B73B00A6E2E3 /* AxisScrollSnapOffsets.h in Headers */,
                                29A812380FBB9C1D00510293 /* AXObjectCache.h in Headers */,
                                91C9F2F91AE3BEB00095B61C /* AXTextStateChangeIntent.h in Headers */,
                                1AE2AA980A1CDD2D00B42B25 /* JSHTMLImageElement.h in Headers */,
                                A80E7E970A1A83E3007FB8C5 /* JSHTMLInputElement.h in Headers */,
                                836B09561F5F34D9003C3702 /* JSHTMLInputElementEntriesAPI.h in Headers */,
-                               2936BF5C21D69E4B004A8FC9 /* AccessibilityObjectInterface.h in Headers */,
                                A6148A7912E41E3B0044A784 /* JSHTMLKeygenElement.h in Headers */,
                                1AE2AB220A1CE63B00B42B25 /* JSHTMLLabelElement.h in Headers */,
                                1AE2AB240A1CE63B00B42B25 /* JSHTMLLegendElement.h in Headers */,
                                51405C89190B014400754F94 /* SelectionRectGatherer.h in Headers */,
                                E44B4BB4141650D7002B1D8B /* SelectorChecker.h in Headers */,
                                432D3FE818A8658400D7DC03 /* SelectorCheckerTestFunctions.h in Headers */,
-                               29AE213521ABA48A00869283 /* AXIsolatedTreeNode.h in Headers */,
                                26B999971804D54200D01121 /* SelectorCompiler.h in Headers */,
                                415071581685067300C3C7B3 /* SelectorFilter.h in Headers */,
                                43107BE218CC19DE00CC18E8 /* SelectorPseudoTypeMap.h in Headers */,
                                977E2E0F12F0FC9C00C13380 /* XSSAuditorDelegate.h in Headers */,
                                A5416FE618810EF80009FC5F /* YouTubeEmbedShadowElement.h in Headers */,
                                7A5515F5191830A3009687D2 /* YouTubePluginReplacement.h in Headers */,
-                               29AE212D21AB9EEB00869283 /* AXIsolatedTree.h in Headers */,
                                FD537353137B651800008DCE /* ZeroPole.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
index dfb055c..d578a97 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "Process.h"
+#include "ProcessIdentifier.h"
 #include <wtf/Hasher.h>
 #include <wtf/text/WTFString.h>
 
index 15e9c68..05f6945 100644 (file)
@@ -28,7 +28,7 @@
 #include "MessagePortChannelProvider.h"
 #include "MessagePortIdentifier.h"
 #include "MessageWithMessagePorts.h"
-#include "Process.h"
+#include "ProcessIdentifier.h"
 #include <wtf/HashSet.h>
 #include <wtf/RefCounted.h>
 #include <wtf/text/WTFString.h>
index f71effb..0c145a7 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "Process.h"
+#include "ProcessIdentifier.h"
 #include <wtf/Function.h>
 #include <wtf/Vector.h>
 
index 42a9f36..916e5e0 100644 (file)
@@ -28,7 +28,7 @@
 #include "MessagePortChannel.h"
 #include "MessagePortChannelProvider.h"
 #include "MessagePortIdentifier.h"
-#include "Process.h"
+#include "ProcessIdentifier.h"
 #include <wtf/HashMap.h>
 
 namespace WebCore {
index 1e83063..a4ee440 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "Process.h"
+#include "ProcessIdentifier.h"
 #include <wtf/DebugUtilities.h>
 #include <wtf/Hasher.h>
 #include <wtf/text/WTFString.h>
index 2a56b49..8c464d6 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "Process.h"
+#include "ProcessIdentifier.h"
 #include <wtf/HashTraits.h>
 #include <wtf/ObjectIdentifier.h>
 
similarity index 98%
rename from Source/WebCore/platform/Process.cpp
rename to Source/WebCore/platform/ProcessIdentifier.cpp
index 8fcfe3a..94dc5ea 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "Process.h"
+#include "ProcessIdentifier.h"
 
 #include <wtf/MainThread.h>
 
index 9e57493..cf9e56f 100644 (file)
@@ -1,3 +1,19 @@
+2019-01-28  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win] WebCore/platform/Process.h is conflicting with process.h
+        https://bugs.webkit.org/show_bug.cgi?id=193944
+
+        Reviewed by Ross Kirsling.
+
+        * Shared/ChildProcess.h:
+        * Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm:
+        * Shared/unix/ChildProcessMain.cpp:
+        * UIProcess/API/APINavigation.h:
+        * UIProcess/ChildProcessProxy.h:
+        * UIProcess/Launcher/ProcessLauncher.h:
+        * UIProcess/WebProcessPool.cpp:
+        * UIProcess/WebProcessProxy.h:
+
 2019-01-28  Jon Lee  <jonlee@apple.com>
 
         Update Screen Capture preference
index 6b96d48..a5d0967 100644 (file)
@@ -29,7 +29,7 @@
 #include "Connection.h"
 #include "MessageReceiverMap.h"
 #include "MessageSender.h"
-#include <WebCore/Process.h>
+#include <WebCore/ProcessIdentifier.h>
 #include <WebCore/UserActivity.h>
 #include <wtf/HashMap.h>
 #include <wtf/RunLoop.h>
index 4472748..1cf0edb 100644 (file)
@@ -28,7 +28,7 @@
 #import "ArgumentCodersCF.h"
 #import "SandboxUtilities.h"
 #import "XPCServiceEntryPoint.h"
-#import <WebCore/Process.h>
+#import <WebCore/ProcessIdentifier.h>
 #import <wtf/cocoa/Entitlements.h>
 
 namespace WebKit {
index 7f69af8..153fbff 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "ChildProcessMain.h"
 
-#include <WebCore/Process.h>
+#include <WebCore/ProcessIdentifier.h>
 #include <stdlib.h>
 
 namespace WebKit {
index 8b0054a..9f4f1f8 100644 (file)
@@ -30,7 +30,7 @@
 #include "FrameInfoData.h"
 #include "NavigationActionData.h"
 #include "WebBackForwardListItem.h"
-#include <WebCore/Process.h>
+#include <WebCore/ProcessIdentifier.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/SecurityOriginData.h>
 #include <wtf/Ref.h>
index fa9b457..1bd0b9b 100644 (file)
@@ -29,7 +29,7 @@
 #include "MessageReceiverMap.h"
 #include "ProcessLauncher.h"
 
-#include <WebCore/Process.h>
+#include <WebCore/ProcessIdentifier.h>
 #include <wtf/ProcessID.h>
 #include <wtf/SystemTracing.h>
 #include <wtf/ThreadSafeRefCounted.h>
index 126cb5e..e48e6b7 100644 (file)
@@ -26,7 +26,7 @@
 #pragma once
 
 #include "Connection.h"
-#include <WebCore/Process.h>
+#include <WebCore/ProcessIdentifier.h>
 #include <wtf/HashMap.h>
 #include <wtf/ProcessID.h>
 #include <wtf/RefPtr.h>
index 9e64800..7f78c6e 100644 (file)
@@ -81,7 +81,7 @@
 #include <WebCore/MockRealtimeMediaSourceCenter.h>
 #include <WebCore/NetworkStorageSession.h>
 #include <WebCore/PlatformScreen.h>
-#include <WebCore/Process.h>
+#include <WebCore/ProcessIdentifier.h>
 #include <WebCore/ProcessWarming.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/RuntimeApplicationChecks.h>
index 835686c..1dde036 100644 (file)
@@ -40,7 +40,7 @@
 #include "WebProcessProxyMessages.h"
 #include <WebCore/MessagePortChannelProvider.h>
 #include <WebCore/MessagePortIdentifier.h>
-#include <WebCore/Process.h>
+#include <WebCore/ProcessIdentifier.h>
 #include <WebCore/SharedStringHash.h>
 #include <memory>
 #include <pal/SessionID.h>