<!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>[269533] trunk/Source</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/269533">269533</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2020-11-06 12:32:10 -0800 (Fri, 06 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move DisplayListFlushIdentifier into WebCore as DisplayList::FlushIdentifier
https://bugs.webkit.org/show_bug.cgi?id=218586

Reviewed by Simon Fraser.

Source/WebCore:

Add DisplayList::FlushIdentifier. See WebKit for more ChangeLogs.

* platform/graphics/displaylists/DisplayList.h:

Source/WebKit:

In preparation for adding a display list item to represent flushing the graphics context, move WebKit's
`DisplayListFlushIdentifier` to the `DisplayList` namespace in WebCore, and rename it to
`DisplayList::FlushIdentifier`.

No change in behavior.

* GPUProcess/graphics/RemoteRenderingBackend.cpp:
(WebKit::RemoteRenderingBackend::flushDisplayListWasCommitted):
(WebKit::RemoteRenderingBackend::flushDisplayListAndCommit):
* GPUProcess/graphics/RemoteRenderingBackend.h:
* GPUProcess/graphics/RemoteRenderingBackend.messages.in:
* Scripts/webkit/messages.py:
* WebKit.xcodeproj/project.pbxproj:
* WebProcess/GPU/graphics/DisplayListFlushIdentifier.h: Removed.
* WebProcess/GPU/graphics/RemoteImageBufferProxy.h:
(WebKit::RemoteImageBufferProxy::commitFlushDisplayList):
* WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp:
(WebKit::RemoteRenderingBackendProxy::flushDisplayListAndCommit):
(WebKit::RemoteRenderingBackendProxy::flushDisplayListWasCommitted):
* WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h:
* WebProcess/GPU/graphics/RemoteRenderingBackendProxy.messages.in:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListh">trunk/Source/WebCore/platform/graphics/displaylists/DisplayList.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitGPUProcessgraphicsRemoteRenderingBackendcpp">trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp</a></li>
<li><a href="#trunkSourceWebKitGPUProcessgraphicsRemoteRenderingBackendh">trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.h</a></li>
<li><a href="#trunkSourceWebKitGPUProcessgraphicsRemoteRenderingBackendmessagesin">trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.messages.in</a></li>
<li><a href="#trunkSourceWebKitScriptswebkitmessagespy">trunk/Source/WebKit/Scripts/webkit/messages.py</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitWebProcessGPUgraphicsRemoteImageBufferProxyh">trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessGPUgraphicsRemoteRenderingBackendProxycpp">trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessGPUgraphicsRemoteRenderingBackendProxyh">trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessGPUgraphicsRemoteRenderingBackendProxymessagesin">trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.messages.in</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitWebProcessGPUgraphicsDisplayListFlushIdentifierh">trunk/Source/WebKit/WebProcess/GPU/graphics/DisplayListFlushIdentifier.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (269532 => 269533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-11-06 20:29:19 UTC (rev 269532)
+++ trunk/Source/WebCore/ChangeLog      2020-11-06 20:32:10 UTC (rev 269533)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2020-11-06  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><ins>+        Move DisplayListFlushIdentifier into WebCore as DisplayList::FlushIdentifier
+        https://bugs.webkit.org/show_bug.cgi?id=218586
+
+        Reviewed by Simon Fraser.
+
+        Add DisplayList::FlushIdentifier. See WebKit for more ChangeLogs.
+
+        * platform/graphics/displaylists/DisplayList.h:
+
+2020-11-06  Wenson Hsieh  <wenson_hsieh@apple.com>
+
</ins><span class="cx">         Unreviewed, fix the Windows 10 debug build after r269525
</span><span class="cx"> 
</span><span class="cx">         Speculative fix: add `NO_RETURN_DUE_TO_ASSERT` to method declarations in DisplayListItems.h as well.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayList.h (269532 => 269533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayList.h        2020-11-06 20:29:19 UTC (rev 269532)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayList.h   2020-11-06 20:32:10 UTC (rev 269533)
</span><span class="lines">@@ -45,6 +45,9 @@
</span><span class="cx"> 
</span><span class="cx"> namespace DisplayList {
</span><span class="cx"> 
</span><ins>+enum FlushIdentifierType { };
+using FlushIdentifier = ObjectIdentifier<FlushIdentifierType>;
+
</ins><span class="cx"> enum AsTextFlag {
</span><span class="cx">     None                            = 0,
</span><span class="cx">     IncludesPlatformOperations      = 1 << 0,
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (269532 => 269533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2020-11-06 20:29:19 UTC (rev 269532)
+++ trunk/Source/WebKit/ChangeLog       2020-11-06 20:32:10 UTC (rev 269533)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2020-11-06  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Move DisplayListFlushIdentifier into WebCore as DisplayList::FlushIdentifier
+        https://bugs.webkit.org/show_bug.cgi?id=218586
+
+        Reviewed by Simon Fraser.
+
+        In preparation for adding a display list item to represent flushing the graphics context, move WebKit's
+        `DisplayListFlushIdentifier` to the `DisplayList` namespace in WebCore, and rename it to
+        `DisplayList::FlushIdentifier`.
+
+        No change in behavior.
+
+        * GPUProcess/graphics/RemoteRenderingBackend.cpp:
+        (WebKit::RemoteRenderingBackend::flushDisplayListWasCommitted):
+        (WebKit::RemoteRenderingBackend::flushDisplayListAndCommit):
+        * GPUProcess/graphics/RemoteRenderingBackend.h:
+        * GPUProcess/graphics/RemoteRenderingBackend.messages.in:
+        * Scripts/webkit/messages.py:
+        * WebKit.xcodeproj/project.pbxproj:
+        * WebProcess/GPU/graphics/DisplayListFlushIdentifier.h: Removed.
+        * WebProcess/GPU/graphics/RemoteImageBufferProxy.h:
+        (WebKit::RemoteImageBufferProxy::commitFlushDisplayList):
+        * WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp:
+        (WebKit::RemoteRenderingBackendProxy::flushDisplayListAndCommit):
+        (WebKit::RemoteRenderingBackendProxy::flushDisplayListWasCommitted):
+        * WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h:
+        * WebProcess/GPU/graphics/RemoteRenderingBackendProxy.messages.in:
+
</ins><span class="cx"> 2020-11-06  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Fix build after adding files to UIProcess/API/Cocoa
</span></span></pre></div>
<a id="trunkSourceWebKitGPUProcessgraphicsRemoteRenderingBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp (269532 => 269533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp       2020-11-06 20:29:19 UTC (rev 269532)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp  2020-11-06 20:32:10 UTC (rev 269533)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx">     send(Messages::RemoteRenderingBackendProxy::ImageBufferBackendWasCreated(logicalSize, backendSize, resolutionScale, colorSpace, WTFMove(handle), renderingResourceIdentifier), m_renderingBackendIdentifier);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RemoteRenderingBackend::flushDisplayListWasCommitted(DisplayListFlushIdentifier flushIdentifier, RenderingResourceIdentifier renderingResourceIdentifier)
</del><ins>+void RemoteRenderingBackend::flushDisplayListWasCommitted(DisplayList::FlushIdentifier flushIdentifier, RenderingResourceIdentifier renderingResourceIdentifier)
</ins><span class="cx"> {
</span><span class="cx">     send(Messages::RemoteRenderingBackendProxy::FlushDisplayListWasCommitted(flushIdentifier, renderingResourceIdentifier), m_renderingBackendIdentifier);
</span><span class="cx"> }
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx">     applyDisplayList(handle, renderingResourceIdentifier, ShouldFlushContext::No);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RemoteRenderingBackend::flushDisplayListAndCommit(const SharedDisplayListHandle& handle, DisplayListFlushIdentifier flushIdentifier, RenderingResourceIdentifier renderingResourceIdentifier)
</del><ins>+void RemoteRenderingBackend::flushDisplayListAndCommit(const SharedDisplayListHandle& handle, DisplayList::FlushIdentifier flushIdentifier, RenderingResourceIdentifier renderingResourceIdentifier)
</ins><span class="cx"> {
</span><span class="cx">     applyDisplayList(handle, renderingResourceIdentifier, ShouldFlushContext::Yes);
</span><span class="cx">     flushDisplayListWasCommitted(flushIdentifier, renderingResourceIdentifier);
</span></span></pre></div>
<a id="trunkSourceWebKitGPUProcessgraphicsRemoteRenderingBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.h (269532 => 269533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.h 2020-11-06 20:29:19 UTC (rev 269532)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.h    2020-11-06 20:32:10 UTC (rev 269533)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #if ENABLE(GPU_PROCESS)
</span><span class="cx"> 
</span><span class="cx"> #include "Connection.h"
</span><del>-#include "DisplayListFlushIdentifier.h"
</del><span class="cx"> #include "ImageBufferBackendHandle.h"
</span><span class="cx"> #include "ImageDataReference.h"
</span><span class="cx"> #include "MessageReceiver.h"
</span><span class="lines">@@ -70,7 +69,7 @@
</span><span class="cx"> 
</span><span class="cx">     // Messages to be sent.
</span><span class="cx">     void imageBufferBackendWasCreated(const WebCore::FloatSize& logicalSize, const WebCore::IntSize& backendSize, float resolutionScale, WebCore::ColorSpace, ImageBufferBackendHandle, WebCore::RenderingResourceIdentifier);
</span><del>-    void flushDisplayListWasCommitted(DisplayListFlushIdentifier, WebCore::RenderingResourceIdentifier);
</del><ins>+    void flushDisplayListWasCommitted(WebCore::DisplayList::FlushIdentifier, WebCore::RenderingResourceIdentifier);
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     RemoteRenderingBackend(GPUConnectionToWebProcess&, RenderingBackendIdentifier);
</span><span class="lines">@@ -89,7 +88,7 @@
</span><span class="cx">     // Messages to be received.
</span><span class="cx">     void createImageBuffer(const WebCore::FloatSize& logicalSize, WebCore::RenderingMode, float resolutionScale, WebCore::ColorSpace, WebCore::RenderingResourceIdentifier);
</span><span class="cx">     void flushDisplayList(const SharedDisplayListHandle&, WebCore::RenderingResourceIdentifier);
</span><del>-    void flushDisplayListAndCommit(const SharedDisplayListHandle&, DisplayListFlushIdentifier, WebCore::RenderingResourceIdentifier);
</del><ins>+    void flushDisplayListAndCommit(const SharedDisplayListHandle&, WebCore::DisplayList::FlushIdentifier, WebCore::RenderingResourceIdentifier);
</ins><span class="cx">     void getImageData(WebCore::AlphaPremultiplication outputFormat, WebCore::IntRect srcRect, WebCore::RenderingResourceIdentifier, CompletionHandler<void(IPC::ImageDataReference&&)>&&);
</span><span class="cx">     void releaseRemoteResource(WebCore::RenderingResourceIdentifier);
</span><span class="cx">     void didCreateSharedItemData(WebCore::DisplayList::ItemBufferIdentifier, const SharedMemory::IPCHandle&);
</span></span></pre></div>
<a id="trunkSourceWebKitGPUProcessgraphicsRemoteRenderingBackendmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.messages.in (269532 => 269533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.messages.in       2020-11-06 20:29:19 UTC (rev 269532)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.messages.in  2020-11-06 20:32:10 UTC (rev 269533)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> messages -> RemoteRenderingBackend NotRefCounted {
</span><span class="cx">     CreateImageBuffer(WebCore::FloatSize logicalSize, WebCore::RenderingMode renderingMode, float resolutionScale, WebCore::ColorSpace colorSpace, WebCore::RenderingResourceIdentifier renderingResourceIdentifier)
</span><span class="cx">     FlushDisplayList(WebKit::SharedDisplayListHandle displayList, WebCore::RenderingResourceIdentifier renderingResourceIdentifier)
</span><del>-    FlushDisplayListAndCommit(WebKit::SharedDisplayListHandle displayList, WebKit::DisplayListFlushIdentifier flushIdentifier, WebCore::RenderingResourceIdentifier renderingResourceIdentifier)
</del><ins>+    FlushDisplayListAndCommit(WebKit::SharedDisplayListHandle displayList, WebCore::DisplayList::FlushIdentifier flushIdentifier, WebCore::RenderingResourceIdentifier renderingResourceIdentifier)
</ins><span class="cx">     GetImageData(enum:uint8_t WebCore::AlphaPremultiplication outputFormat, WebCore::IntRect srcRect, WebCore::RenderingResourceIdentifier renderingResourceIdentifier) -> (IPC::ImageDataReference imageData) Synchronous
</span><span class="cx">     DidCreateSharedItemData(WebCore::DisplayList::ItemBufferIdentifier identifier, WebKit::SharedMemory::IPCHandle handle)
</span><span class="cx">     ReleaseRemoteResource(WebCore::RenderingResourceIdentifier renderingResourceIdentifier)
</span></span></pre></div>
<a id="trunkSourceWebKitScriptswebkitmessagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Scripts/webkit/messages.py (269532 => 269533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Scripts/webkit/messages.py   2020-11-06 20:29:19 UTC (rev 269532)
+++ trunk/Source/WebKit/Scripts/webkit/messages.py      2020-11-06 20:32:10 UTC (rev 269533)
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx">         'WebKit::AudioMediaStreamTrackRendererIdentifier',
</span><span class="cx">         'WebKit::ContentWorldIdentifier',
</span><span class="cx">         'WebKit::DisplayLinkObserverID',
</span><del>-        'WebKit::DisplayListFlushIdentifier',
</del><ins>+        'WebCore::DisplayList::FlushIdentifier',
</ins><span class="cx">         'WebKit::DownloadID',
</span><span class="cx">         'WebKit::GeolocationIdentifier',
</span><span class="cx">         'WebKit::ImageBufferBackendHandle',
</span><span class="lines">@@ -588,6 +588,7 @@
</span><span class="cx">         'JSC::MessageSource': ['<JavaScriptCore/ConsoleTypes.h>'],
</span><span class="cx">         'Inspector::InspectorTargetType': ['<JavaScriptCore/InspectorTarget.h>'],
</span><span class="cx">         'Inspector::FrontendChannel::ConnectionType': ['<JavaScriptCore/InspectorFrontendChannel.h>'],
</span><ins>+        'WebCore::DisplayList::FlushIdentifier': ['<WebCore/DisplayList.h>'],
</ins><span class="cx">         'WebCore::DisplayList::ItemBufferIdentifier': ['<WebCore/DisplayList.h>'],
</span><span class="cx">         'MediaTime': ['<wtf/MediaTime.h>'],
</span><span class="cx">         'MonotonicTime': ['<wtf/MonotonicTime.h>'],
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (269532 => 269533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj     2020-11-06 20:29:19 UTC (rev 269532)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj        2020-11-06 20:32:10 UTC (rev 269533)
</span><span class="lines">@@ -3925,7 +3925,6 @@
</span><span class="cx">          550640A424071C2100AAE045 /* RemoteRenderingBackend.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RemoteRenderingBackend.messages.in; sourceTree = "<group>"; };
</span><span class="cx">          55AD09422408A02E00DE4D2F /* RemoteImageBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteImageBuffer.h; sourceTree = "<group>"; };
</span><span class="cx">          55AD09432408A0E600DE4D2F /* PlatformRemoteImageBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformRemoteImageBuffer.h; sourceTree = "<group>"; };
</span><del>-               55AD09442408ABB300DE4D2F /* DisplayListFlushIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DisplayListFlushIdentifier.h; sourceTree = "<group>"; };
</del><span class="cx">           570AB8F220AE3BD700B8BE87 /* SecKeyProxyStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecKeyProxyStore.h; sourceTree = "<group>"; };
</span><span class="cx">          570AB90020B2517400B8BE87 /* AuthenticationChallengeProxyCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AuthenticationChallengeProxyCocoa.mm; sourceTree = "<group>"; };
</span><span class="cx">          570AB90320B2541C00B8BE87 /* SecKeyProxyStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SecKeyProxyStore.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -8171,7 +8170,6 @@
</span><span class="cx">                  isa = PBXGroup;
</span><span class="cx">                  children = (
</span><span class="cx">                          727A7F3324078527004D2931 /* cocoa */,
</span><del>-                               55AD09442408ABB300DE4D2F /* DisplayListFlushIdentifier.h */,
</del><span class="cx">                           727A7F39240788F1004D2931 /* ImageBufferBackendHandle.h */,
</span><span class="cx">                          727A7F37240788F0004D2931 /* ImageBufferShareableBitmapBackend.cpp */,
</span><span class="cx">                          727A7F36240788F0004D2931 /* ImageBufferShareableBitmapBackend.h */,
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessGPUgraphicsDisplayListFlushIdentifierh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/WebProcess/GPU/graphics/DisplayListFlushIdentifier.h (269532 => 269533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/GPU/graphics/DisplayListFlushIdentifier.h 2020-11-06 20:29:19 UTC (rev 269532)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/DisplayListFlushIdentifier.h    2020-11-06 20:32:10 UTC (rev 269533)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-/*
- * Copyright (C) 2020 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
-
-#if ENABLE(GPU_PROCESS)
-
-#include <wtf/ObjectIdentifier.h>
-
-namespace WebKit {
-
-enum DisplayListFlushIdentifierType { };
-using DisplayListFlushIdentifier = ObjectIdentifier<DisplayListFlushIdentifierType>;
-
-} // namespace WebKit
-
-#endif // ENABLE(GPU_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKitWebProcessGPUgraphicsRemoteImageBufferProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h (269532 => 269533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h     2020-11-06 20:29:19 UTC (rev 269532)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h        2020-11-06 20:32:10 UTC (rev 269533)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">         m_backend = BackendType::create(logicalSize, backendSize, resolutionScale, colorSpace, WTFMove(handle));
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void commitFlushDisplayList(DisplayListFlushIdentifier flushIdentifier)
</del><ins>+    void commitFlushDisplayList(WebCore::DisplayList::FlushIdentifier flushIdentifier)
</ins><span class="cx">     {
</span><span class="cx">         m_receivedFlushIdentifier = flushIdentifier;
</span><span class="cx">     }
</span><span class="lines">@@ -288,8 +288,8 @@
</span><span class="cx">             flushDrawingContext();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    DisplayListFlushIdentifier m_sentFlushIdentifier;
-    DisplayListFlushIdentifier m_receivedFlushIdentifier;
</del><ins>+    WebCore::DisplayList::FlushIdentifier m_sentFlushIdentifier;
+    WebCore::DisplayList::FlushIdentifier m_receivedFlushIdentifier;
</ins><span class="cx">     WeakPtr<RemoteRenderingBackendProxy> m_remoteRenderingBackendProxy;
</span><span class="cx">     size_t m_itemCountInCurrentDisplayList { 0 };
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessGPUgraphicsRemoteRenderingBackendProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp (269532 => 269533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp      2020-11-06 20:29:19 UTC (rev 269532)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp 2020-11-06 20:32:10 UTC (rev 269533)
</span><span class="lines">@@ -121,9 +121,9 @@
</span><span class="cx">     m_sharedItemBuffers.clear();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-DisplayListFlushIdentifier RemoteRenderingBackendProxy::flushDisplayListAndCommit(const DisplayList::DisplayList& displayList, RenderingResourceIdentifier renderingResourceIdentifier)
</del><ins>+DisplayList::FlushIdentifier RemoteRenderingBackendProxy::flushDisplayListAndCommit(const DisplayList::DisplayList& displayList, RenderingResourceIdentifier renderingResourceIdentifier)
</ins><span class="cx"> {
</span><del>-    DisplayListFlushIdentifier sentFlushIdentifier = DisplayListFlushIdentifier::generate();
</del><ins>+    auto sentFlushIdentifier = DisplayList::FlushIdentifier::generate();
</ins><span class="cx">     send(Messages::RemoteRenderingBackend::FlushDisplayListAndCommit({ displayList }, sentFlushIdentifier, renderingResourceIdentifier), m_renderingBackendIdentifier);
</span><span class="cx">     m_sharedItemBuffers.clear();
</span><span class="cx">     return sentFlushIdentifier;
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx">         downcast<UnacceleratedRemoteImageBufferProxy>(*imageBuffer).createBackend(logicalSize, backendSize, resolutionScale, colorSpace, WTFMove(handle));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RemoteRenderingBackendProxy::flushDisplayListWasCommitted(DisplayListFlushIdentifier flushIdentifier, RenderingResourceIdentifier renderingResourceIdentifier)
</del><ins>+void RemoteRenderingBackendProxy::flushDisplayListWasCommitted(DisplayList::FlushIdentifier flushIdentifier, RenderingResourceIdentifier renderingResourceIdentifier)
</ins><span class="cx"> {
</span><span class="cx">     auto imageBuffer = m_remoteResourceCacheProxy.cachedImageBuffer(renderingResourceIdentifier);
</span><span class="cx">     if (!imageBuffer)
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessGPUgraphicsRemoteRenderingBackendProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h (269532 => 269533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h        2020-11-06 20:29:19 UTC (rev 269532)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h   2020-11-06 20:32:10 UTC (rev 269533)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(GPU_PROCESS)
</span><span class="cx"> 
</span><del>-#include "DisplayListFlushIdentifier.h"
</del><span class="cx"> #include "ImageBufferBackendHandle.h"
</span><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx"> #include "MessageSender.h"
</span><span class="lines">@@ -74,7 +73,7 @@
</span><span class="cx">     RefPtr<WebCore::ImageBuffer> createImageBuffer(const WebCore::FloatSize&, WebCore::RenderingMode, float resolutionScale, WebCore::ColorSpace);
</span><span class="cx">     RefPtr<WebCore::ImageData> getImageData(WebCore::AlphaPremultiplication outputFormat, const WebCore::IntRect& srcRect, WebCore::RenderingResourceIdentifier);
</span><span class="cx">     void flushDisplayList(const WebCore::DisplayList::DisplayList&, WebCore::RenderingResourceIdentifier);
</span><del>-    DisplayListFlushIdentifier flushDisplayListAndCommit(const WebCore::DisplayList::DisplayList&, WebCore::RenderingResourceIdentifier);
</del><ins>+    WebCore::DisplayList::FlushIdentifier flushDisplayListAndCommit(const WebCore::DisplayList::DisplayList&, WebCore::RenderingResourceIdentifier);
</ins><span class="cx">     void releaseRemoteResource(WebCore::RenderingResourceIdentifier);
</span><span class="cx"> 
</span><span class="cx">     bool waitForImageBufferBackendWasCreated();
</span><span class="lines">@@ -85,7 +84,7 @@
</span><span class="cx"> 
</span><span class="cx">     // Messages to be received.
</span><span class="cx">     void imageBufferBackendWasCreated(const WebCore::FloatSize& logicalSize, const WebCore::IntSize& backendSize, float resolutionScale, WebCore::ColorSpace, ImageBufferBackendHandle, WebCore::RenderingResourceIdentifier);
</span><del>-    void flushDisplayListWasCommitted(DisplayListFlushIdentifier, WebCore::RenderingResourceIdentifier);
</del><ins>+    void flushDisplayListWasCommitted(WebCore::DisplayList::FlushIdentifier, WebCore::RenderingResourceIdentifier);
</ins><span class="cx"> 
</span><span class="cx">     RemoteResourceCacheProxy m_remoteResourceCacheProxy;
</span><span class="cx">     HashMap<WebCore::DisplayList::ItemBufferIdentifier, RefPtr<SharedMemory>> m_sharedItemBuffers;
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessGPUgraphicsRemoteRenderingBackendProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.messages.in (269532 => 269533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.messages.in      2020-11-06 20:29:19 UTC (rev 269532)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.messages.in 2020-11-06 20:32:10 UTC (rev 269533)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> 
</span><span class="cx"> messages -> RemoteRenderingBackendProxy NotRefCounted {
</span><span class="cx">     ImageBufferBackendWasCreated(WebCore::FloatSize logicalSize, WebCore::IntSize backendSize, float resolutionScale, WebCore::ColorSpace colorSpace, WebKit::ImageBufferBackendHandle handle, WebCore::RenderingResourceIdentifier renderingResourceIdentifier)
</span><del>-    FlushDisplayListWasCommitted(WebKit::DisplayListFlushIdentifier flushIdentifier, WebCore::RenderingResourceIdentifier renderingResourceIdentifier)
</del><ins>+    FlushDisplayListWasCommitted(WebCore::DisplayList::FlushIdentifier flushIdentifier, WebCore::RenderingResourceIdentifier renderingResourceIdentifier)
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #endif // ENABLE(GPU_PROCESS)
</span></span></pre>
</div>
</div>

</body>
</html>