Diff
Modified: trunk/Source/WebCore/ChangeLog (240639 => 240640)
--- trunk/Source/WebCore/ChangeLog 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebCore/ChangeLog 2019-01-29 05:58:00 UTC (rev 240640)
@@ -1,3 +1,28 @@
+2019-01-28 Fujii Hironori <[email protected]>
+
+ [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 <[email protected]>
Implement capture for Pointer Events on iOS
Modified: trunk/Source/WebCore/Sources.txt (240639 => 240640)
--- trunk/Source/WebCore/Sources.txt 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebCore/Sources.txt 2019-01-29 05:58:00 UTC (rev 240640)
@@ -1628,7 +1628,7 @@
platform/PlatformSpeechSynthesisVoice.cpp
platform/PlatformSpeechSynthesizer.cpp
platform/PlatformStrategies.cpp
-platform/Process.cpp
+platform/ProcessIdentifier.cpp
platform/ReferrerPolicy.cpp
platform/RemoteCommandListener.cpp
platform/RuntimeApplicationChecks.cpp
Modified: trunk/Source/WebCore/UnifiedSources-input.xcfilelist (240639 => 240640)
--- trunk/Source/WebCore/UnifiedSources-input.xcfilelist 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebCore/UnifiedSources-input.xcfilelist 2019-01-29 05:58:00 UTC (rev 240640)
@@ -2629,7 +2629,7 @@
$(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
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (240639 => 240640)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2019-01-29 05:58:00 UTC (rev 240640)
@@ -8441,8 +8441,8 @@
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; };
@@ -17279,8 +17279,8 @@
29A812040FBB9B4100510293 /* accessibility */ = {
isa = PBXGroup;
children = (
+ AAA728EF16D1D8BC00D3BBC6 /* ios */,
29AE212921AB9ECB00869283 /* isolatedtree */,
- AAA728EF16D1D8BC00D3BBC6 /* ios */,
29A812050FBB9B5200510293 /* mac */,
2981CA9D131822EC00D12F2A /* AccessibilityARIAGrid.cpp */,
29A812160FBB9C1D00510293 /* AccessibilityARIAGrid.h */,
@@ -17377,10 +17377,10 @@
29AE212921AB9ECB00869283 /* isolatedtree */ = {
isa = PBXGroup;
children = (
+ 29AE212C21AB9EEB00869283 /* AXIsolatedTree.cpp */,
29AE212B21AB9EEB00869283 /* AXIsolatedTree.h */,
- 29AE212C21AB9EEB00869283 /* AXIsolatedTree.cpp */,
+ 29AE213421ABA48A00869283 /* AXIsolatedTreeNode.cpp */,
29AE213321ABA48A00869283 /* AXIsolatedTreeNode.h */,
- 29AE213421ABA48A00869283 /* AXIsolatedTreeNode.cpp */,
);
path = isolatedtree;
sourceTree = "<group>";
@@ -25547,8 +25547,8 @@
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 */,
@@ -28270,6 +28270,7 @@
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 */,
@@ -28439,6 +28440,8 @@
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 */,
@@ -30012,7 +30015,6 @@
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 */,
@@ -31469,7 +31471,6 @@
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 */,
@@ -32406,7 +32407,6 @@
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;
Modified: trunk/Source/WebCore/dom/MessagePortIdentifier.h (240639 => 240640)
--- trunk/Source/WebCore/dom/MessagePortIdentifier.h 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebCore/dom/MessagePortIdentifier.h 2019-01-29 05:58:00 UTC (rev 240640)
@@ -25,7 +25,7 @@
#pragma once
-#include "Process.h"
+#include "ProcessIdentifier.h"
#include <wtf/Hasher.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebCore/dom/messageports/MessagePortChannel.h (240639 => 240640)
--- trunk/Source/WebCore/dom/messageports/MessagePortChannel.h 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebCore/dom/messageports/MessagePortChannel.h 2019-01-29 05:58:00 UTC (rev 240640)
@@ -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>
Modified: trunk/Source/WebCore/dom/messageports/MessagePortChannelProvider.h (240639 => 240640)
--- trunk/Source/WebCore/dom/messageports/MessagePortChannelProvider.h 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebCore/dom/messageports/MessagePortChannelProvider.h 2019-01-29 05:58:00 UTC (rev 240640)
@@ -25,7 +25,7 @@
#pragma once
-#include "Process.h"
+#include "ProcessIdentifier.h"
#include <wtf/Function.h>
#include <wtf/Vector.h>
Modified: trunk/Source/WebCore/dom/messageports/MessagePortChannelRegistry.h (240639 => 240640)
--- trunk/Source/WebCore/dom/messageports/MessagePortChannelRegistry.h 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebCore/dom/messageports/MessagePortChannelRegistry.h 2019-01-29 05:58:00 UTC (rev 240640)
@@ -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 {
Modified: trunk/Source/WebCore/history/BackForwardItemIdentifier.h (240639 => 240640)
--- trunk/Source/WebCore/history/BackForwardItemIdentifier.h 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebCore/history/BackForwardItemIdentifier.h 2019-01-29 05:58:00 UTC (rev 240640)
@@ -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>
Modified: trunk/Source/WebCore/page/GlobalWindowIdentifier.h (240639 => 240640)
--- trunk/Source/WebCore/page/GlobalWindowIdentifier.h 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebCore/page/GlobalWindowIdentifier.h 2019-01-29 05:58:00 UTC (rev 240640)
@@ -25,7 +25,7 @@
#pragma once
-#include "Process.h"
+#include "ProcessIdentifier.h"
#include <wtf/HashTraits.h>
#include <wtf/ObjectIdentifier.h>
Deleted: trunk/Source/WebCore/platform/Process.cpp (240639 => 240640)
--- trunk/Source/WebCore/platform/Process.cpp 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebCore/platform/Process.cpp 2019-01-29 05:58:00 UTC (rev 240640)
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "Process.h"
-
-#include <wtf/MainThread.h>
-
-namespace WebCore {
-namespace Process {
-
-static Optional<ProcessIdentifier> globalIdentifier;
-
-void setIdentifier(ProcessIdentifier processIdentifier)
-{
- ASSERT(isUIThread());
- globalIdentifier = processIdentifier;
-}
-
-ProcessIdentifier identifier()
-{
- static std::once_flag onceFlag;
- std::call_once(onceFlag, [] {
- if (!globalIdentifier)
- globalIdentifier = generateObjectIdentifier<ProcessIdentifierType>();
- });
-
- return *globalIdentifier;
-}
-
-} // namespace Process
-} // namespace WebCore
Deleted: trunk/Source/WebCore/platform/Process.h (240639 => 240640)
--- trunk/Source/WebCore/platform/Process.h 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebCore/platform/Process.h 2019-01-29 05:58:00 UTC (rev 240640)
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include <wtf/ObjectIdentifier.h>
-
-namespace WebCore {
-
-enum ProcessIdentifierType { };
-using ProcessIdentifier = ObjectIdentifier<ProcessIdentifierType>;
-
-namespace Process {
-
-WEBCORE_EXPORT void setIdentifier(ProcessIdentifier);
-WEBCORE_EXPORT ProcessIdentifier identifier();
-
-} // namespace Process
-} // namespace WebCore
Copied: trunk/Source/WebCore/platform/ProcessIdentifier.cpp (from rev 240639, trunk/Source/WebCore/platform/Process.cpp) (0 => 240640)
--- trunk/Source/WebCore/platform/ProcessIdentifier.cpp (rev 0)
+++ trunk/Source/WebCore/platform/ProcessIdentifier.cpp 2019-01-29 05:58:00 UTC (rev 240640)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "ProcessIdentifier.h"
+
+#include <wtf/MainThread.h>
+
+namespace WebCore {
+namespace Process {
+
+static Optional<ProcessIdentifier> globalIdentifier;
+
+void setIdentifier(ProcessIdentifier processIdentifier)
+{
+ ASSERT(isUIThread());
+ globalIdentifier = processIdentifier;
+}
+
+ProcessIdentifier identifier()
+{
+ static std::once_flag onceFlag;
+ std::call_once(onceFlag, [] {
+ if (!globalIdentifier)
+ globalIdentifier = generateObjectIdentifier<ProcessIdentifierType>();
+ });
+
+ return *globalIdentifier;
+}
+
+} // namespace Process
+} // namespace WebCore
Copied: trunk/Source/WebCore/platform/ProcessIdentifier.h (from rev 240639, trunk/Source/WebCore/platform/Process.h) (0 => 240640)
--- trunk/Source/WebCore/platform/ProcessIdentifier.h (rev 0)
+++ trunk/Source/WebCore/platform/ProcessIdentifier.h 2019-01-29 05:58:00 UTC (rev 240640)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <wtf/ObjectIdentifier.h>
+
+namespace WebCore {
+
+enum ProcessIdentifierType { };
+using ProcessIdentifier = ObjectIdentifier<ProcessIdentifierType>;
+
+namespace Process {
+
+WEBCORE_EXPORT void setIdentifier(ProcessIdentifier);
+WEBCORE_EXPORT ProcessIdentifier identifier();
+
+} // namespace Process
+} // namespace WebCore
Modified: trunk/Source/WebKit/ChangeLog (240639 => 240640)
--- trunk/Source/WebKit/ChangeLog 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebKit/ChangeLog 2019-01-29 05:58:00 UTC (rev 240640)
@@ -1,3 +1,19 @@
+2019-01-28 Fujii Hironori <[email protected]>
+
+ [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 <[email protected]>
Update Screen Capture preference
Modified: trunk/Source/WebKit/Shared/ChildProcess.h (240639 => 240640)
--- trunk/Source/WebKit/Shared/ChildProcess.h 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebKit/Shared/ChildProcess.h 2019-01-29 05:58:00 UTC (rev 240640)
@@ -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>
Modified: trunk/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm (240639 => 240640)
--- trunk/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm 2019-01-29 05:58:00 UTC (rev 240640)
@@ -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 {
Modified: trunk/Source/WebKit/Shared/unix/ChildProcessMain.cpp (240639 => 240640)
--- trunk/Source/WebKit/Shared/unix/ChildProcessMain.cpp 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebKit/Shared/unix/ChildProcessMain.cpp 2019-01-29 05:58:00 UTC (rev 240640)
@@ -26,7 +26,7 @@
#include "config.h"
#include "ChildProcessMain.h"
-#include <WebCore/Process.h>
+#include <WebCore/ProcessIdentifier.h>
#include <stdlib.h>
namespace WebKit {
Modified: trunk/Source/WebKit/UIProcess/API/APINavigation.h (240639 => 240640)
--- trunk/Source/WebKit/UIProcess/API/APINavigation.h 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebKit/UIProcess/API/APINavigation.h 2019-01-29 05:58:00 UTC (rev 240640)
@@ -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>
Modified: trunk/Source/WebKit/UIProcess/ChildProcessProxy.h (240639 => 240640)
--- trunk/Source/WebKit/UIProcess/ChildProcessProxy.h 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebKit/UIProcess/ChildProcessProxy.h 2019-01-29 05:58:00 UTC (rev 240640)
@@ -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>
Modified: trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h (240639 => 240640)
--- trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h 2019-01-29 05:58:00 UTC (rev 240640)
@@ -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>
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (240639 => 240640)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-01-29 05:58:00 UTC (rev 240640)
@@ -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>
Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.h (240639 => 240640)
--- trunk/Source/WebKit/UIProcess/WebProcessProxy.h 2019-01-29 05:21:41 UTC (rev 240639)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.h 2019-01-29 05:58:00 UTC (rev 240640)
@@ -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>
