Attachment 360416 Details for Bug 193944 – Patch

[patch] Patch

bug-193944-20190129115623.patch (text/plain), 26.03 KB, created by Fujii Hironori on 2019-01-28 18:56:24 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2019-01-28 18:56:24 PST

Size: 26.03 KB

patch

obsolete

>Subversion Revision: 240622
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index b9260e6555305a7d596f479efd283471bac95674..bf734a43b7acbd98f3a42250974e275d7a7610b5 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -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 NOBODY (OOPS!).
>+
>+        Windows has process.h. Rename WebCore/platform/Process.h to Process.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  Simon Fraser  <simon.fraser@apple.com>
> 
>         svg/text/select-text-inside-non-static-position.html crashes under ScrollingStateTree::unparentChildrenAndDestroyNode()
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 47462b4fdcb5c0f2b24191169b5b438164977184..17e0b5e8fb430712947a98431c610bbd6b75755d 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -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 NOBODY (OOPS!).
>+
>+        * 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  David Kilzer  <ddkilzer@apple.com>
> 
>         Move soft-linking of ManagedConfiguration.framework out of ManagedConfigurationSPI.h
>diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt
>index de5421f8f8fc32c46e7ac9a7f9bda7dd4d13ebdb..538bb1db44ab30e6767f1ee024e66ad8c2008d39 100644
>--- a/Source/WebCore/Sources.txt
>+++ b/Source/WebCore/Sources.txt
>@@ -1627,7 +1627,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
>diff --git a/Source/WebCore/UnifiedSources-input.xcfilelist b/Source/WebCore/UnifiedSources-input.xcfilelist
>index 379a4733545db8f6d3a0675688b927c94f092cad..3e54fef85efbe64a7cb749cec75a1fb9298d49d8 100644
>--- a/Source/WebCore/UnifiedSources-input.xcfilelist
>+++ b/Source/WebCore/UnifiedSources-input.xcfilelist
>@@ -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
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index 9cc3bae41a26100463ac92e39211b5543591ec4b..b2de1ba1eb6fc3c2906d663d155627c36b797393 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -8440,8 +8440,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; };
>@@ -17276,8 +17276,8 @@
> 		29A812040FBB9B4100510293 /* accessibility */ = {
> 			isa = PBXGroup;
> 			children = (
>-				29AE212921AB9ECB00869283 /* isolatedtree */,
> 				AAA728EF16D1D8BC00D3BBC6 /* ios */,
>+				29AE212921AB9ECB00869283 /* isolatedtree */,
> 				29A812050FBB9B5200510293 /* mac */,
> 				2981CA9D131822EC00D12F2A /* AccessibilityARIAGrid.cpp */,
> 				29A812160FBB9C1D00510293 /* AccessibilityARIAGrid.h */,
>@@ -17374,10 +17374,10 @@
> 		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>";
>@@ -25542,8 +25542,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 */,
>@@ -28265,6 +28265,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 */,
>@@ -28434,6 +28435,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 */,
>@@ -30007,7 +30010,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 */,
>@@ -31464,7 +31466,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 */,
>@@ -32400,7 +32401,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;
>diff --git a/Source/WebCore/dom/MessagePortIdentifier.h b/Source/WebCore/dom/MessagePortIdentifier.h
>index dfb055c0d1890ba156cc6cc24948feeb920f2a7c..d578a973030108b043e277b4757153000c6b94a1 100644
>--- a/Source/WebCore/dom/MessagePortIdentifier.h
>+++ b/Source/WebCore/dom/MessagePortIdentifier.h
>@@ -25,7 +25,7 @@
> 
> #pragma once
> 
>-#include "Process.h"
>+#include "ProcessIdentifier.h"
> #include <wtf/Hasher.h>
> #include <wtf/text/WTFString.h>
> 
>diff --git a/Source/WebCore/dom/messageports/MessagePortChannel.h b/Source/WebCore/dom/messageports/MessagePortChannel.h
>index 15e9c681eedaa0e43bfdb1325f441deb076adbc8..05f6945227dcccd75348fdc551118611af2ce485 100644
>--- a/Source/WebCore/dom/messageports/MessagePortChannel.h
>+++ b/Source/WebCore/dom/messageports/MessagePortChannel.h
>@@ -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>
>diff --git a/Source/WebCore/dom/messageports/MessagePortChannelProvider.h b/Source/WebCore/dom/messageports/MessagePortChannelProvider.h
>index f71effb426dfb15582f6af11c7ccdf11b33dc099..0c145a7ce0e0ae4947ce8a420d6ba972c5f8dcb8 100644
>--- a/Source/WebCore/dom/messageports/MessagePortChannelProvider.h
>+++ b/Source/WebCore/dom/messageports/MessagePortChannelProvider.h
>@@ -25,7 +25,7 @@
> 
> #pragma once
> 
>-#include "Process.h"
>+#include "ProcessIdentifier.h"
> #include <wtf/Function.h>
> #include <wtf/Vector.h>
> 
>diff --git a/Source/WebCore/dom/messageports/MessagePortChannelRegistry.h b/Source/WebCore/dom/messageports/MessagePortChannelRegistry.h
>index 42a9f36ee13722bba89f05095c9d36f35e1f5cf9..916e5e05a4128223a8fab416b3b3ab7c66cc703f 100644
>--- a/Source/WebCore/dom/messageports/MessagePortChannelRegistry.h
>+++ b/Source/WebCore/dom/messageports/MessagePortChannelRegistry.h
>@@ -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 {
>diff --git a/Source/WebCore/history/BackForwardItemIdentifier.h b/Source/WebCore/history/BackForwardItemIdentifier.h
>index 1e830637640bb0a116edd94b6c88100f55b8e9f9..a4ee4403662078871d00c3209458ebefeba7a322 100644
>--- a/Source/WebCore/history/BackForwardItemIdentifier.h
>+++ b/Source/WebCore/history/BackForwardItemIdentifier.h
>@@ -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>
>diff --git a/Source/WebCore/page/GlobalWindowIdentifier.h b/Source/WebCore/page/GlobalWindowIdentifier.h
>index 2a56b490b3f24554acb0795a61ab1166108d50e9..8c464d604cfff5e4cb8e25a80134c231c1794cd7 100644
>--- a/Source/WebCore/page/GlobalWindowIdentifier.h
>+++ b/Source/WebCore/page/GlobalWindowIdentifier.h
>@@ -25,7 +25,7 @@
> 
> #pragma once
> 
>-#include "Process.h"
>+#include "ProcessIdentifier.h"
> #include <wtf/HashTraits.h>
> #include <wtf/ObjectIdentifier.h>
> 
>diff --git a/Source/WebCore/platform/Process.cpp b/Source/WebCore/platform/Process.cpp
>deleted file mode 100644
>index 8fcfe3af4a6e3e7b059be857304290ea43436d25..0000000000000000000000000000000000000000
>--- a/Source/WebCore/platform/Process.cpp
>+++ /dev/null
>@@ -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
>diff --git a/Source/WebCore/platform/Process.h b/Source/WebCore/platform/Process.h
>deleted file mode 100644
>index 3e10009348e5e1a954c72f17fcd0caed3dd27522..0000000000000000000000000000000000000000
>--- a/Source/WebCore/platform/Process.h
>+++ /dev/null
>@@ -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
>diff --git a/Source/WebCore/platform/ProcessIdentifier.cpp b/Source/WebCore/platform/ProcessIdentifier.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..94dc5ea3b635fd83fae0d230cc1bff5b8c417e00
>--- /dev/null
>+++ b/Source/WebCore/platform/ProcessIdentifier.cpp
>@@ -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
>diff --git a/Source/WebCore/platform/ProcessIdentifier.h b/Source/WebCore/platform/ProcessIdentifier.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..3e10009348e5e1a954c72f17fcd0caed3dd27522
>--- /dev/null
>+++ b/Source/WebCore/platform/ProcessIdentifier.h
>@@ -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
>diff --git a/Source/WebKit/Shared/ChildProcess.h b/Source/WebKit/Shared/ChildProcess.h
>index 6b96d48d7cbc96a35f37fd923bccd0343207a0ba..a5d0967c8b94704691d0fdc89758eb65a5166a06 100644
>--- a/Source/WebKit/Shared/ChildProcess.h
>+++ b/Source/WebKit/Shared/ChildProcess.h
>@@ -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>
>diff --git a/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm b/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
>index 4472748a25678cbc1bed33f9199190bd57c2a70e..1cf0edb2cd2abf68e0b8f0278f116be50a040d46 100644
>--- a/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
>+++ b/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
>@@ -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 {
>diff --git a/Source/WebKit/Shared/unix/ChildProcessMain.cpp b/Source/WebKit/Shared/unix/ChildProcessMain.cpp
>index 7f69af88ce482de68134424620eeb58a20af2d29..a9a283496a368f593fde10a7dee38504456920bb 100644
>--- a/Source/WebKit/Shared/unix/ChildProcessMain.cpp
>+++ b/Source/WebKit/Shared/unix/ChildProcessMain.cpp
>@@ -26,7 +26,7 @@
> #include "config.h"
> #include "ChildProcessMain.h"
> 
>-#include <WebCore/Process.h>
>+#include <WebCore/Processidentifier.h>
> #include <stdlib.h>
> 
> namespace WebKit {
>diff --git a/Source/WebKit/UIProcess/API/APINavigation.h b/Source/WebKit/UIProcess/API/APINavigation.h
>index 8b0054a7fd95f3b03bfd6550999dd85298b72940..9f4f1f81a38048d1734ec217ea283dfa1c80155a 100644
>--- a/Source/WebKit/UIProcess/API/APINavigation.h
>+++ b/Source/WebKit/UIProcess/API/APINavigation.h
>@@ -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>
>diff --git a/Source/WebKit/UIProcess/ChildProcessProxy.h b/Source/WebKit/UIProcess/ChildProcessProxy.h
>index fa9b45769b8aa9b560725baa1ace03ace64e7b8c..1bd0b9bbf2aa80f2ffffda23efedc3eea5709332 100644
>--- a/Source/WebKit/UIProcess/ChildProcessProxy.h
>+++ b/Source/WebKit/UIProcess/ChildProcessProxy.h
>@@ -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>
>diff --git a/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h b/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h
>index 126cb5e4bf82bb99724fe02e4aca540081f93266..e48e6b70c51d3144be20f5e631997d971128ca49 100644
>--- a/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h
>+++ b/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h
>@@ -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>
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
>index 9e64800160f6c21411c7325a7d9e558047b88b3b..7f78c6eadbbdf5bf163ad4fbcb469137051d5e7f 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
>+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
>@@ -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>
>diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h
>index 835686c63013cbcd9d03357b01757f81c40ebd02..1dde036067a65d492192f831ce01e61cf953c5ad 100644
>--- a/Source/WebKit/UIProcess/WebProcessProxy.h
>+++ b/Source/WebKit/UIProcess/WebProcessProxy.h
>@@ -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>

Actions: View | Formatted Diff | Diff

Attachments on bug 193944: 360416 | 360418