<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[282756] trunk/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/282756">282756</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-09-20 10:29:33 -0700 (Mon, 20 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use ObjectIdentifier for WebURLSchemeHandler
https://bugs.webkit.org/show_bug.cgi?id=230462

Patch by Michael Catanzaro <mcatanzaro@gnome.org> on 2021-09-20
Reviewed by Alex Christensen.

* Scripts/webkit/messages.py:
(types_that_cannot_be_forward_declared):
* Shared/URLSchemeTaskParameters.cpp:
(WebKit::URLSchemeTaskParameters::decode):
* Shared/URLSchemeTaskParameters.h:
(): Deleted.
* Shared/WebPageCreationParameters.h:
* Shared/WebURLSchemeHandlerIdentifier.h: Copied from Source/WebKit/Shared/URLSchemeTaskParameters.h.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::stopURLSchemeTask):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/WebURLSchemeHandler.cpp:
(WebKit::WebURLSchemeHandler::WebURLSchemeHandler):
(WebKit::generateWebURLSchemeHandlerIdentifier): Deleted.
* UIProcess/WebURLSchemeHandler.h:
(WebKit::WebURLSchemeHandler::identifier const):
* WebKit.xcodeproj/project.pbxproj:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::registerURLSchemeHandler):
(WebKit::WebPage::urlSchemeTaskWillPerformRedirection):
(WebKit::WebPage::urlSchemeTaskDidPerformRedirection):
(WebKit::WebPage::urlSchemeTaskDidReceiveResponse):
(WebKit::WebPage::urlSchemeTaskDidReceiveData):
(WebKit::WebPage::urlSchemeTaskDidComplete):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/WebURLSchemeHandlerProxy.cpp:
(WebKit::WebURLSchemeHandlerProxy::WebURLSchemeHandlerProxy):
* WebProcess/WebPage/WebURLSchemeHandlerProxy.h:
(WebKit::WebURLSchemeHandlerProxy::create):
(WebKit::WebURLSchemeHandlerProxy::identifier const):
(): Deleted.
* WebProcess/WebPage/WebURLSchemeTaskProxy.cpp:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitScriptswebkitmessagespy">trunk/Source/WebKit/Scripts/webkit/messages.py</a></li>
<li><a href="#trunkSourceWebKitSharedURLSchemeTaskParameterscpp">trunk/Source/WebKit/Shared/URLSchemeTaskParameters.cpp</a></li>
<li><a href="#trunkSourceWebKitSharedURLSchemeTaskParametersh">trunk/Source/WebKit/Shared/URLSchemeTaskParameters.h</a></li>
<li><a href="#trunkSourceWebKitSharedWebPageCreationParametersh">trunk/Source/WebKit/Shared/WebPageCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPageProxycpp">trunk/Source/WebKit/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPageProxyh">trunk/Source/WebKit/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPageProxymessagesin">trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebURLSchemeHandlercpp">trunk/Source/WebKit/UIProcess/WebURLSchemeHandler.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebURLSchemeHandlerh">trunk/Source/WebKit/UIProcess/WebURLSchemeHandler.h</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebPagecpp">trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebPageh">trunk/Source/WebKit/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebPagemessagesin">trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebURLSchemeHandlerProxycpp">trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeHandlerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebURLSchemeHandlerProxyh">trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeHandlerProxy.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebURLSchemeTaskProxycpp">trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitSharedWebURLSchemeHandlerIdentifierh">trunk/Source/WebKit/Shared/WebURLSchemeHandlerIdentifier.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/ChangeLog       2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2021-09-20  Michael Catanzaro  <mcatanzaro@gnome.org>
+
+        Use ObjectIdentifier for WebURLSchemeHandler
+        https://bugs.webkit.org/show_bug.cgi?id=230462
+
+        Reviewed by Alex Christensen.
+
+        * Scripts/webkit/messages.py:
+        (types_that_cannot_be_forward_declared):
+        * Shared/URLSchemeTaskParameters.cpp:
+        (WebKit::URLSchemeTaskParameters::decode):
+        * Shared/URLSchemeTaskParameters.h:
+        (): Deleted.
+        * Shared/WebPageCreationParameters.h:
+        * Shared/WebURLSchemeHandlerIdentifier.h: Copied from Source/WebKit/Shared/URLSchemeTaskParameters.h.
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::stopURLSchemeTask):
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebPageProxy.messages.in:
+        * UIProcess/WebURLSchemeHandler.cpp:
+        (WebKit::WebURLSchemeHandler::WebURLSchemeHandler):
+        (WebKit::generateWebURLSchemeHandlerIdentifier): Deleted.
+        * UIProcess/WebURLSchemeHandler.h:
+        (WebKit::WebURLSchemeHandler::identifier const):
+        * WebKit.xcodeproj/project.pbxproj:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::registerURLSchemeHandler):
+        (WebKit::WebPage::urlSchemeTaskWillPerformRedirection):
+        (WebKit::WebPage::urlSchemeTaskDidPerformRedirection):
+        (WebKit::WebPage::urlSchemeTaskDidReceiveResponse):
+        (WebKit::WebPage::urlSchemeTaskDidReceiveData):
+        (WebKit::WebPage::urlSchemeTaskDidComplete):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/WebPage.messages.in:
+        * WebProcess/WebPage/WebURLSchemeHandlerProxy.cpp:
+        (WebKit::WebURLSchemeHandlerProxy::WebURLSchemeHandlerProxy):
+        * WebProcess/WebPage/WebURLSchemeHandlerProxy.h:
+        (WebKit::WebURLSchemeHandlerProxy::create):
+        (WebKit::WebURLSchemeHandlerProxy::identifier const):
+        (): Deleted.
+        * WebProcess/WebPage/WebURLSchemeTaskProxy.cpp:
+
</ins><span class="cx"> 2021-09-20  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Stop using makeRef(*this) / makeRefPtr(this)
</span></span></pre></div>
<a id="trunkSourceWebKitScriptswebkitmessagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Scripts/webkit/messages.py (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Scripts/webkit/messages.py   2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/Scripts/webkit/messages.py      2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -354,6 +354,7 @@
</span><span class="cx">         'WebKit::TransactionID',
</span><span class="cx">         'WebKit::UserContentControllerIdentifier',
</span><span class="cx">         'WebKit::WebPageProxyIdentifier',
</span><ins>+        'WebKit::WebURLSchemeHandlerIdentifier',
</ins><span class="cx">         'WebKit::XRDeviceIdentifier',
</span><span class="cx">     ])
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitSharedURLSchemeTaskParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/URLSchemeTaskParameters.cpp (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/URLSchemeTaskParameters.cpp   2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/Shared/URLSchemeTaskParameters.cpp      2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> 
</span><span class="cx"> std::optional<URLSchemeTaskParameters> URLSchemeTaskParameters::decode(IPC::Decoder& decoder)
</span><span class="cx"> {
</span><del>-    std::optional<uint64_t> handlerIdentifier;
</del><ins>+    std::optional<WebURLSchemeHandlerIdentifier> handlerIdentifier;
</ins><span class="cx">     decoder >> handlerIdentifier;
</span><span class="cx">     if (!handlerIdentifier)
</span><span class="cx">         return std::nullopt;
</span></span></pre></div>
<a id="trunkSourceWebKitSharedURLSchemeTaskParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/URLSchemeTaskParameters.h (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/URLSchemeTaskParameters.h     2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/Shared/URLSchemeTaskParameters.h        2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><span class="cx"> #include "FrameInfoData.h"
</span><ins>+#include "WebURLSchemeHandlerIdentifier.h"
</ins><span class="cx"> #include <WebCore/ResourceLoaderIdentifier.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> 
</span><span class="lines">@@ -37,7 +38,7 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><span class="cx"> struct URLSchemeTaskParameters {
</span><del>-    uint64_t handlerIdentifier { 0 };
</del><ins>+    WebURLSchemeHandlerIdentifier handlerIdentifier;
</ins><span class="cx">     WebCore::ResourceLoaderIdentifier taskIdentifier;
</span><span class="cx">     WebCore::ResourceRequest request;
</span><span class="cx">     FrameInfoData frameInfo;
</span></span></pre></div>
<a id="trunkSourceWebKitSharedWebPageCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/WebPageCreationParameters.h (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/WebPageCreationParameters.h   2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/Shared/WebPageCreationParameters.h      2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "WebPageGroupData.h"
</span><span class="cx"> #include "WebPageProxyIdentifier.h"
</span><span class="cx"> #include "WebPreferencesStore.h"
</span><ins>+#include "WebURLSchemeHandlerIdentifier.h"
</ins><span class="cx"> #include <WebCore/ActivityState.h>
</span><span class="cx"> #include <WebCore/Color.h>
</span><span class="cx"> #include <WebCore/DestinationColorSpace.h>
</span><span class="lines">@@ -201,7 +202,7 @@
</span><span class="cx">     String overrideContentSecurityPolicy;
</span><span class="cx">     std::optional<double> cpuLimit;
</span><span class="cx"> 
</span><del>-    HashMap<String, uint64_t> urlSchemeHandlers;
</del><ins>+    HashMap<String, WebURLSchemeHandlerIdentifier> urlSchemeHandlers;
</ins><span class="cx">     Vector<String> urlSchemesWithLegacyCustomProtocolHandlers;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(APPLICATION_MANIFEST)
</span></span></pre></div>
<a id="trunkSourceWebKitSharedWebURLSchemeHandlerIdentifierhfromrev282755trunkSourceWebKitSharedURLSchemeTaskParametersh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit/Shared/WebURLSchemeHandlerIdentifier.h (from rev 282755, trunk/Source/WebKit/Shared/URLSchemeTaskParameters.h) (0 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/WebURLSchemeHandlerIdentifier.h                               (rev 0)
+++ trunk/Source/WebKit/Shared/WebURLSchemeHandlerIdentifier.h  2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+/*
+ * Copyright (C) 2021 Red Hat Inc.
+ *
+ * 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 WebKit {
+
+class WebURLSchemeHandler;
+
+using WebURLSchemeHandlerIdentifier = ObjectIdentifier<WebURLSchemeHandler>;
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp   2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp      2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -10002,7 +10002,7 @@
</span><span class="cx">     iterator->value->startTask(*this, process, webPageID, WTFMove(parameters), nullptr);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebPageProxy::stopURLSchemeTask(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier)
</del><ins>+void WebPageProxy::stopURLSchemeTask(WebURLSchemeHandlerIdentifier handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier)
</ins><span class="cx"> {
</span><span class="cx">     MESSAGE_CHECK(m_process, decltype(m_urlSchemeHandlersByIdentifier)::isValidKey(handlerIdentifier));
</span><span class="cx">     auto iterator = m_urlSchemeHandlersByIdentifier.find(handlerIdentifier);
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebPageProxy.h     2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h        2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> #include "WebPaymentCoordinatorProxy.h"
</span><span class="cx"> #include "WebPopupMenuProxy.h"
</span><span class="cx"> #include "WebPreferences.h"
</span><ins>+#include "WebURLSchemeHandlerIdentifier.h"
</ins><span class="cx"> #include "WebUndoStepID.h"
</span><span class="cx"> #include "WebsitePoliciesData.h"
</span><span class="cx"> #include "WindowKind.h"
</span><span class="lines">@@ -2427,7 +2428,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     void startURLSchemeTask(URLSchemeTaskParameters&&);
</span><del>-    void stopURLSchemeTask(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier);
</del><ins>+    void stopURLSchemeTask(WebURLSchemeHandlerIdentifier, WebCore::ResourceLoaderIdentifier);
</ins><span class="cx">     void loadSynchronousURLSchemeTask(URLSchemeTaskParameters&&, Messages::WebPageProxy::LoadSynchronousURLSchemeTaskDelayedReply&&);
</span><span class="cx"> 
</span><span class="cx">     bool checkURLReceivedFromCurrentOrPreviousWebProcess(WebProcessProxy&, const String&);
</span><span class="lines">@@ -2981,7 +2982,7 @@
</span><span class="cx">     bool m_preferFasterClickOverDoubleTap { false };
</span><span class="cx"> 
</span><span class="cx">     HashMap<String, Ref<WebURLSchemeHandler>> m_urlSchemeHandlersByScheme;
</span><del>-    HashMap<uint64_t, Ref<WebURLSchemeHandler>> m_urlSchemeHandlersByIdentifier;
</del><ins>+    HashMap<WebURLSchemeHandlerIdentifier, Ref<WebURLSchemeHandler>> m_urlSchemeHandlersByIdentifier;
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span><span class="cx">     using IdentifierToAttachmentMap = HashMap<String, Ref<API::Attachment>>;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in   2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in      2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -521,7 +521,7 @@
</span><span class="cx">     SetIsUsingHighPerformanceWebGL(bool isUsingHighPerformanceWebGL)
</span><span class="cx"> 
</span><span class="cx">     StartURLSchemeTask(struct WebKit::URLSchemeTaskParameters parameters)
</span><del>-    StopURLSchemeTask(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier)
</del><ins>+    StopURLSchemeTask(WebKit::WebURLSchemeHandlerIdentifier handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier)
</ins><span class="cx">     LoadSynchronousURLSchemeTask(struct WebKit::URLSchemeTaskParameters parameters) -> (WebCore::ResourceResponse response, WebCore::ResourceError error, Vector<uint8_t> data) Synchronous
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(DEVICE_ORIENTATION)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebURLSchemeHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebURLSchemeHandler.cpp (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebURLSchemeHandler.cpp    2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/UIProcess/WebURLSchemeHandler.cpp       2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -33,14 +33,8 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><del>-static uint64_t generateWebURLSchemeHandlerIdentifier()
-{
-    static uint64_t nextIdentifier = 1;
-    return nextIdentifier++;
-}
-
</del><span class="cx"> WebURLSchemeHandler::WebURLSchemeHandler()
</span><del>-    : m_identifier(generateWebURLSchemeHandlerIdentifier())
</del><ins>+    : m_identifier(WebURLSchemeHandlerIdentifier::generate())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebURLSchemeHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebURLSchemeHandler.h (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebURLSchemeHandler.h      2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/UIProcess/WebURLSchemeHandler.h 2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><ins>+#include "WebURLSchemeHandlerIdentifier.h"
</ins><span class="cx"> #include "WebURLSchemeTask.h"
</span><span class="cx"> #include <WebCore/ResourceLoaderIdentifier.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -49,7 +50,7 @@
</span><span class="cx"> public:
</span><span class="cx">     virtual ~WebURLSchemeHandler();
</span><span class="cx"> 
</span><del>-    uint64_t identifier() const { return m_identifier; }
</del><ins>+    WebURLSchemeHandlerIdentifier identifier() const { return m_identifier; }
</ins><span class="cx"> 
</span><span class="cx">     void startTask(WebPageProxy&, WebProcessProxy&, WebCore::PageIdentifier, URLSchemeTaskParameters&&, SyncLoadCompletionHandler&&);
</span><span class="cx">     void stopTask(WebPageProxy&, WebCore::ResourceLoaderIdentifier taskIdentifier);
</span><span class="lines">@@ -67,7 +68,7 @@
</span><span class="cx">     void removeTaskFromPageMap(WebPageProxyIdentifier, WebCore::ResourceLoaderIdentifier);
</span><span class="cx">     WebProcessProxy* processForTaskIdentifier(WebCore::ResourceLoaderIdentifier) const;
</span><span class="cx"> 
</span><del>-    uint64_t m_identifier;
</del><ins>+    WebURLSchemeHandlerIdentifier m_identifier;
</ins><span class="cx"> 
</span><span class="cx">     HashMap<WebCore::ResourceLoaderIdentifier, Ref<WebURLSchemeTask>> m_tasks;
</span><span class="cx">     HashMap<WebPageProxyIdentifier, HashSet<WebCore::ResourceLoaderIdentifier>> m_tasksByPageIdentifier;
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj     2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj        2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -4595,6 +4595,7 @@
</span><span class="cx">          5CD2864F1E722F440094FDC8 /* WKContentRuleListStoreInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentRuleListStoreInternal.h; sourceTree = "<group>"; };
</span><span class="cx">          5CD286501E722F440094FDC8 /* WKContentRuleListStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentRuleListStorePrivate.h; sourceTree = "<group>"; };
</span><span class="cx">          5CD748B523C8EB190092A9B5 /* NetworkResourceLoadIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkResourceLoadIdentifier.h; sourceTree = "<group>"; };
</span><ins>+               5CD748B523C8EB190092A999 /* WebURLSchemeHandlerIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebURLSchemeHandlerIdentifier.h; sourceTree = "<group>"; };
</ins><span class="cx">           5CE0C366229F2D3D003695F0 /* APIContextMenuElementInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIContextMenuElementInfo.cpp; sourceTree = "<group>"; };
</span><span class="cx">          5CE0C367229F2D3E003695F0 /* APIContextMenuElementInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIContextMenuElementInfo.h; sourceTree = "<group>"; };
</span><span class="cx">          5CE0C368229F2D4A003695F0 /* WKContextMenuElementInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKContextMenuElementInfo.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -6998,6 +6999,7 @@
</span><span class="cx">                          8360349E1ACB34D600626549 /* WebSQLiteDatabaseTracker.h */,
</span><span class="cx">                          C0337DD7127A51B6008FF4F4 /* WebTouchEvent.cpp */,
</span><span class="cx">                          0F4001002527D73C00E91DA7 /* WebTouchEvent.h */,
</span><ins>+                               5CD748B523C8EB190092A999 /* WebURLSchemeHandlerIdentifier.h */,
</ins><span class="cx">                           7C065F291C8CD95F00C2D950 /* WebUserContentControllerDataTypes.cpp */,
</span><span class="cx">                          7C065F2A1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h */,
</span><span class="cx">                          C0337DD0127A2980008FF4F4 /* WebWheelEvent.cpp */,
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp       2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp  2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -6931,9 +6931,9 @@
</span><span class="cx">         handler->stopAllTasks();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebPage::registerURLSchemeHandler(uint64_t handlerIdentifier, const String& scheme)
</del><ins>+void WebPage::registerURLSchemeHandler(WebURLSchemeHandlerIdentifier handlerIdentifier, const String& scheme)
</ins><span class="cx"> {
</span><del>-    WEBPAGE_RELEASE_LOG(Process, "registerURLSchemeHandler: Registered handler %" PRIu64 " for the '%s' scheme", handlerIdentifier, scheme.utf8().data());
</del><ins>+    WEBPAGE_RELEASE_LOG(Process, "registerURLSchemeHandler: Registered handler %" PRIu64 " for the '%s' scheme", handlerIdentifier.toUInt64(), scheme.utf8().data());
</ins><span class="cx">     WebCore::LegacySchemeRegistry::registerURLSchemeAsHandledBySchemeHandler(scheme);
</span><span class="cx">     WebCore::LegacySchemeRegistry::registerURLSchemeAsCORSEnabled(scheme);
</span><span class="cx">     auto schemeResult = m_schemeToURLSchemeHandlerProxyMap.add(scheme, WebURLSchemeHandlerProxy::create(*this, handlerIdentifier));
</span><span class="lines">@@ -6940,7 +6940,7 @@
</span><span class="cx">     m_identifierToURLSchemeHandlerProxyMap.add(handlerIdentifier, schemeResult.iterator->value.get());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebPage::urlSchemeTaskWillPerformRedirection(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, ResourceResponse&& response, ResourceRequest&& request, CompletionHandler<void(WebCore::ResourceRequest&&)>&& completionHandler)
</del><ins>+void WebPage::urlSchemeTaskWillPerformRedirection(WebURLSchemeHandlerIdentifier handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, ResourceResponse&& response, ResourceRequest&& request, CompletionHandler<void(WebCore::ResourceRequest&&)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx">     auto* handler = m_identifierToURLSchemeHandlerProxyMap.get(handlerIdentifier);
</span><span class="cx">     ASSERT(handler);
</span><span class="lines">@@ -6949,7 +6949,7 @@
</span><span class="cx">     handler->taskDidPerformRedirection(taskIdentifier, WTFMove(response), WTFMove(request), WTFMove(completionHandler));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebPage::urlSchemeTaskDidPerformRedirection(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, ResourceResponse&& response, ResourceRequest&& request)
</del><ins>+void WebPage::urlSchemeTaskDidPerformRedirection(WebURLSchemeHandlerIdentifier handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, ResourceResponse&& response, ResourceRequest&& request)
</ins><span class="cx"> {
</span><span class="cx">     auto* handler = m_identifierToURLSchemeHandlerProxyMap.get(handlerIdentifier);
</span><span class="cx">     ASSERT(handler);
</span><span class="lines">@@ -6957,7 +6957,7 @@
</span><span class="cx">     handler->taskDidPerformRedirection(taskIdentifier, WTFMove(response), WTFMove(request), [] (ResourceRequest&&) {});
</span><span class="cx"> }
</span><span class="cx">     
</span><del>-void WebPage::urlSchemeTaskDidReceiveResponse(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, const ResourceResponse& response)
</del><ins>+void WebPage::urlSchemeTaskDidReceiveResponse(WebURLSchemeHandlerIdentifier handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, const ResourceResponse& response)
</ins><span class="cx"> {
</span><span class="cx">     auto* handler = m_identifierToURLSchemeHandlerProxyMap.get(handlerIdentifier);
</span><span class="cx">     ASSERT(handler);
</span><span class="lines">@@ -6965,7 +6965,7 @@
</span><span class="cx">     handler->taskDidReceiveResponse(taskIdentifier, response);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebPage::urlSchemeTaskDidReceiveData(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, const IPC::DataReference& data)
</del><ins>+void WebPage::urlSchemeTaskDidReceiveData(WebURLSchemeHandlerIdentifier handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, const IPC::DataReference& data)
</ins><span class="cx"> {
</span><span class="cx">     auto* handler = m_identifierToURLSchemeHandlerProxyMap.get(handlerIdentifier);
</span><span class="cx">     ASSERT(handler);
</span><span class="lines">@@ -6973,7 +6973,7 @@
</span><span class="cx">     handler->taskDidReceiveData(taskIdentifier, data.size(), data.data());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebPage::urlSchemeTaskDidComplete(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, const ResourceError& error)
</del><ins>+void WebPage::urlSchemeTaskDidComplete(WebURLSchemeHandlerIdentifier handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, const ResourceError& error)
</ins><span class="cx"> {
</span><span class="cx">     auto* handler = m_identifierToURLSchemeHandlerProxyMap.get(handlerIdentifier);
</span><span class="cx">     ASSERT(handler);
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h    2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -1875,13 +1875,13 @@
</span><span class="cx"> 
</span><span class="cx">     void frameBecameRemote(WebCore::FrameIdentifier, WebCore::GlobalFrameIdentifier&& remoteFrameIdentifier, WebCore::GlobalWindowIdentifier&& remoteWindowIdentifier);
</span><span class="cx"> 
</span><del>-    void registerURLSchemeHandler(uint64_t identifier, const String& scheme);
</del><ins>+    void registerURLSchemeHandler(WebURLSchemeHandlerIdentifier, const String& scheme);
</ins><span class="cx"> 
</span><del>-    void urlSchemeTaskWillPerformRedirection(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, CompletionHandler<void(WebCore::ResourceRequest&&)>&&);
-    void urlSchemeTaskDidPerformRedirection(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, WebCore::ResourceResponse&&, WebCore::ResourceRequest&&);
-    void urlSchemeTaskDidReceiveResponse(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, const WebCore::ResourceResponse&);
-    void urlSchemeTaskDidReceiveData(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, const IPC::DataReference&);
-    void urlSchemeTaskDidComplete(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, const WebCore::ResourceError&);
</del><ins>+    void urlSchemeTaskWillPerformRedirection(WebURLSchemeHandlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, CompletionHandler<void(WebCore::ResourceRequest&&)>&&);
+    void urlSchemeTaskDidPerformRedirection(WebURLSchemeHandlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, WebCore::ResourceResponse&&, WebCore::ResourceRequest&&);
+    void urlSchemeTaskDidReceiveResponse(WebURLSchemeHandlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, const WebCore::ResourceResponse&);
+    void urlSchemeTaskDidReceiveData(WebURLSchemeHandlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, const IPC::DataReference&);
+    void urlSchemeTaskDidComplete(WebURLSchemeHandlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, const WebCore::ResourceError&);
</ins><span class="cx"> 
</span><span class="cx">     void setIsTakingSnapshotsForApplicationSuspension(bool);
</span><span class="cx">     void setNeedsDOMWindowResizeEvent();
</span><span class="lines">@@ -2311,7 +2311,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     HashMap<String, RefPtr<WebURLSchemeHandlerProxy>> m_schemeToURLSchemeHandlerProxyMap;
</span><del>-    HashMap<uint64_t, WebURLSchemeHandlerProxy*> m_identifierToURLSchemeHandlerProxyMap;
</del><ins>+    HashMap<WebURLSchemeHandlerIdentifier, WebURLSchemeHandlerProxy*> m_identifierToURLSchemeHandlerProxyMap;
</ins><span class="cx"> 
</span><span class="cx">     HashMap<uint64_t, Function<void(bool granted)>> m_storageAccessResponseCallbackMap;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in       2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in  2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -551,13 +551,13 @@
</span><span class="cx"> 
</span><span class="cx">     FrameBecameRemote(WebCore::FrameIdentifier frameID, struct WebCore::GlobalFrameIdentifier remoteFrameIdentifier, struct WebCore::GlobalWindowIdentifier remoteWindowIdentifier)
</span><span class="cx"> 
</span><del>-    RegisterURLSchemeHandler(uint64_t identifier, String scheme)
</del><ins>+    RegisterURLSchemeHandler(WebKit::WebURLSchemeHandlerIdentifier handlerIdentifier, String scheme)
</ins><span class="cx"> 
</span><del>-    URLSchemeTaskWillPerformRedirection(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, WebCore::ResourceResponse response, WebCore::ResourceRequest proposedRequest) -> (WebCore::ResourceRequest actualRequest) Async
-    URLSchemeTaskDidPerformRedirection(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, WebCore::ResourceResponse response, WebCore::ResourceRequest proposedRequest)
-    URLSchemeTaskDidReceiveResponse(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, WebCore::ResourceResponse response)
-    URLSchemeTaskDidReceiveData(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, IPC::SharedBufferDataReference data)
-    URLSchemeTaskDidComplete(uint64_t handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, WebCore::ResourceError error)
</del><ins>+    URLSchemeTaskWillPerformRedirection(WebKit::WebURLSchemeHandlerIdentifier handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, WebCore::ResourceResponse response, WebCore::ResourceRequest proposedRequest) -> (WebCore::ResourceRequest actualRequest) Async
+    URLSchemeTaskDidPerformRedirection(WebKit::WebURLSchemeHandlerIdentifier handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, WebCore::ResourceResponse response, WebCore::ResourceRequest proposedRequest)
+    URLSchemeTaskDidReceiveResponse(WebKit::WebURLSchemeHandlerIdentifier handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, WebCore::ResourceResponse response)
+    URLSchemeTaskDidReceiveData(WebKit::WebURLSchemeHandlerIdentifier handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, IPC::SharedBufferDataReference data)
+    URLSchemeTaskDidComplete(WebKit::WebURLSchemeHandlerIdentifier handlerIdentifier, WebCore::ResourceLoaderIdentifier taskIdentifier, WebCore::ResourceError error)
</ins><span class="cx"> 
</span><span class="cx">     SetIsSuspended(bool suspended)
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebURLSchemeHandlerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeHandlerProxy.cpp (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeHandlerProxy.cpp      2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeHandlerProxy.cpp 2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><del>-WebURLSchemeHandlerProxy::WebURLSchemeHandlerProxy(WebPage& page, uint64_t identifier)
</del><ins>+WebURLSchemeHandlerProxy::WebURLSchemeHandlerProxy(WebPage& page, WebURLSchemeHandlerIdentifier identifier)
</ins><span class="cx">     : m_webPage(page)
</span><span class="cx">     , m_identifier(identifier)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebURLSchemeHandlerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeHandlerProxy.h (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeHandlerProxy.h        2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeHandlerProxy.h   2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><ins>+#include "WebURLSchemeHandlerIdentifier.h"
</ins><span class="cx"> #include "WebURLSchemeTaskProxy.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -42,7 +43,7 @@
</span><span class="cx"> 
</span><span class="cx"> class WebURLSchemeHandlerProxy : public RefCounted<WebURLSchemeHandlerProxy> {
</span><span class="cx"> public:
</span><del>-    static Ref<WebURLSchemeHandlerProxy> create(WebPage& page, uint64_t identifier)
</del><ins>+    static Ref<WebURLSchemeHandlerProxy> create(WebPage& page, WebURLSchemeHandlerIdentifier identifier)
</ins><span class="cx">     {
</span><span class="cx">         return adoptRef(*new WebURLSchemeHandlerProxy(page, identifier));
</span><span class="cx">     }
</span><span class="lines">@@ -53,7 +54,7 @@
</span><span class="cx"> 
</span><span class="cx">     void loadSynchronously(WebCore::ResourceLoaderIdentifier, WebFrame&, const WebCore::ResourceRequest&, WebCore::ResourceResponse&, WebCore::ResourceError&, Vector<uint8_t>&);
</span><span class="cx"> 
</span><del>-    uint64_t identifier() const { return m_identifier; }
</del><ins>+    WebURLSchemeHandlerIdentifier identifier() const { return m_identifier; }
</ins><span class="cx">     WebPage& page() { return m_webPage; }
</span><span class="cx"> 
</span><span class="cx">     void taskDidPerformRedirection(WebCore::ResourceLoaderIdentifier, WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, CompletionHandler<void(WebCore::ResourceRequest&&)>&&);
</span><span class="lines">@@ -63,13 +64,12 @@
</span><span class="cx">     void taskDidStopLoading(WebURLSchemeTaskProxy&);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    WebURLSchemeHandlerProxy(WebPage&, uint64_t identifier);
</del><ins>+    WebURLSchemeHandlerProxy(WebPage&, WebURLSchemeHandlerIdentifier);
</ins><span class="cx"> 
</span><span class="cx">     RefPtr<WebURLSchemeTaskProxy> removeTask(WebCore::ResourceLoaderIdentifier);
</span><span class="cx"> 
</span><span class="cx">     WebPage& m_webPage;
</span><del>-    // FIXME: This should be a strongly typed identifier.
-    uint64_t m_identifier { 0 };
</del><ins>+    WebURLSchemeHandlerIdentifier m_identifier;
</ins><span class="cx"> 
</span><span class="cx">     HashMap<WebCore::ResourceLoaderIdentifier, RefPtr<WebURLSchemeTaskProxy>> m_tasks;
</span><span class="cx"> }; // class WebURLSchemeHandlerProxy
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebURLSchemeTaskProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.cpp (282755 => 282756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.cpp 2021-09-20 17:17:38 UTC (rev 282755)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.cpp    2021-09-20 17:29:33 UTC (rev 282756)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> #include <wtf/CompletionHandler.h>
</span><span class="cx"> 
</span><span class="cx"> #define WEBURLSCHEMETASKPROXY_RELEASE_LOG_STANDARD_TEMPLATE "[schemeHandler=%" PRIu64 ", webPageID=%" PRIu64 ", frameID=%" PRIu64 ", taskID=%" PRIu64 "] WebURLSchemeTaskProxy::"
</span><del>-#define WEBURLSCHEMETASKPROXY_RELEASE_LOG_STANDARD_PARAMETERS m_urlSchemeHandler.identifier(), pageIDFromWebFrame(m_frame), frameIDFromWebFrame(m_frame), m_identifier.toUInt64()
</del><ins>+#define WEBURLSCHEMETASKPROXY_RELEASE_LOG_STANDARD_PARAMETERS m_urlSchemeHandler.identifier().toUInt64(), pageIDFromWebFrame(m_frame), frameIDFromWebFrame(m_frame), m_identifier.toUInt64()
</ins><span class="cx"> #define WEBURLSCHEMETASKPROXY_RELEASE_LOG(fmt, ...) RELEASE_LOG(Network, WEBURLSCHEMETASKPROXY_RELEASE_LOG_STANDARD_TEMPLATE fmt, WEBURLSCHEMETASKPROXY_RELEASE_LOG_STANDARD_PARAMETERS, ##__VA_ARGS__)
</span><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span></span></pre>
</div>
</div>

</body>
</html>