Diff
Modified: trunk/Source/WebCore/ChangeLog (269605 => 269606)
--- trunk/Source/WebCore/ChangeLog 2020-11-09 22:54:02 UTC (rev 269605)
+++ trunk/Source/WebCore/ChangeLog 2020-11-09 23:11:40 UTC (rev 269606)
@@ -1,3 +1,20 @@
+2020-11-09 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Rename ImageBuffer::flushDisplayList to ImageBuffer::submitDisplayList
+ https://bugs.webkit.org/show_bug.cgi?id=218720
+
+ Reviewed by Tim Horton.
+
+ Rename `flushDisplayList` to `submitDisplayList`, to better capture the fact that it's only responsible for
+ applying the contents of the given display list rather than performing a context flush, or applying and clearing
+ out the contents of the given display list.
+
+ No change in behavior.
+
+ * platform/graphics/ImageBuffer.h:
+ (WebCore::ImageBuffer::submitDisplayList):
+ (WebCore::ImageBuffer::flushDisplayList): Deleted.
+
2020-11-09 Alan Bujtas <za...@apple.com>
Unreviewed, reverting r269603.
Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.h (269605 => 269606)
--- trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2020-11-09 22:54:02 UTC (rev 269605)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2020-11-09 23:11:40 UTC (rev 269606)
@@ -72,7 +72,7 @@
virtual bool prefersPreparationForDisplay() { return false; }
virtual void flushDrawingContext() { }
virtual void flushDrawingContextAndCommit() { }
- virtual void flushDisplayList(const DisplayList::DisplayList&) { }
+ virtual void submitDisplayList(const DisplayList::DisplayList&) { }
virtual AffineTransform baseTransform() const = 0;
virtual IntSize logicalSize() const = 0;
Modified: trunk/Source/WebKit/ChangeLog (269605 => 269606)
--- trunk/Source/WebKit/ChangeLog 2020-11-09 22:54:02 UTC (rev 269605)
+++ trunk/Source/WebKit/ChangeLog 2020-11-09 23:11:40 UTC (rev 269606)
@@ -1,3 +1,29 @@
+2020-11-09 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Rename ImageBuffer::flushDisplayList to ImageBuffer::submitDisplayList
+ https://bugs.webkit.org/show_bug.cgi?id=218720
+
+ Reviewed by Tim Horton.
+
+ See Source/WebCore/ChangeLog for more details.
+
+ * GPUProcess/graphics/RemoteImageBuffer.h:
+ * GPUProcess/graphics/RemoteRenderingBackend.cpp:
+ (WebKit::RemoteRenderingBackend::applyDisplayList):
+ (WebKit::RemoteRenderingBackend::submitDisplayList):
+ (WebKit::RemoteRenderingBackend::flushDisplayList): Deleted.
+
+ Additionally rename `flushDisplayList` on `RemoteRenderingBackend`, since this IPC message doesn't actually
+ perform a context flush.
+
+ * GPUProcess/graphics/RemoteRenderingBackend.h:
+ * GPUProcess/graphics/RemoteRenderingBackend.messages.in:
+ * WebProcess/GPU/graphics/RemoteImageBufferProxy.h:
+ * WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp:
+ (WebKit::RemoteRenderingBackendProxy::submitDisplayList):
+ (WebKit::RemoteRenderingBackendProxy::flushDisplayList): Deleted.
+ * WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h:
+
2020-11-09 Alan Bujtas <za...@apple.com>
Unreviewed, reverting r269603.
Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteImageBuffer.h (269605 => 269606)
--- trunk/Source/WebKit/GPUProcess/graphics/RemoteImageBuffer.h 2020-11-09 22:54:02 UTC (rev 269605)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteImageBuffer.h 2020-11-09 23:11:40 UTC (rev 269606)
@@ -65,7 +65,7 @@
}
private:
- void flushDisplayList(const WebCore::DisplayList::DisplayList& displayList) override
+ void submitDisplayList(const WebCore::DisplayList::DisplayList& displayList) override
{
if (!displayList.isEmpty()) {
const auto& imageBuffers = m_remoteRenderingBackend.remoteResourceCache().imageBuffers();
Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp (269605 => 269606)
--- trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp 2020-11-09 22:54:02 UTC (rev 269605)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp 2020-11-09 23:11:40 UTC (rev 269606)
@@ -144,13 +144,13 @@
}
displayList->setItemBufferClient(this);
- imageBuffer->flushDisplayList(*displayList);
+ imageBuffer->submitDisplayList(*displayList);
if (flushContext == ShouldFlushContext::Yes)
imageBuffer->flushContext();
}
-void RemoteRenderingBackend::flushDisplayList(const SharedDisplayListHandle& handle, RenderingResourceIdentifier renderingResourceIdentifier)
+void RemoteRenderingBackend::submitDisplayList(const SharedDisplayListHandle& handle, RenderingResourceIdentifier renderingResourceIdentifier)
{
applyDisplayList(handle, renderingResourceIdentifier, ShouldFlushContext::No);
}
Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.h (269605 => 269606)
--- trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.h 2020-11-09 22:54:02 UTC (rev 269605)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.h 2020-11-09 23:11:40 UTC (rev 269606)
@@ -100,7 +100,7 @@
// Messages to be received.
void createImageBuffer(const WebCore::FloatSize& logicalSize, WebCore::RenderingMode, float resolutionScale, WebCore::ColorSpace, WebCore::RenderingResourceIdentifier);
- void flushDisplayList(const SharedDisplayListHandle&, WebCore::RenderingResourceIdentifier);
+ void submitDisplayList(const SharedDisplayListHandle&, WebCore::RenderingResourceIdentifier);
void flushDisplayListAndCommit(const SharedDisplayListHandle&, WebCore::DisplayList::FlushIdentifier, WebCore::RenderingResourceIdentifier);
void getImageData(WebCore::AlphaPremultiplication outputFormat, WebCore::IntRect srcRect, WebCore::RenderingResourceIdentifier, CompletionHandler<void(IPC::ImageDataReference&&)>&&);
void releaseRemoteResource(WebCore::RenderingResourceIdentifier);
Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.messages.in (269605 => 269606)
--- trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.messages.in 2020-11-09 22:54:02 UTC (rev 269605)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.messages.in 2020-11-09 23:11:40 UTC (rev 269606)
@@ -24,7 +24,7 @@
messages -> RemoteRenderingBackend NotRefCounted {
CreateImageBuffer(WebCore::FloatSize logicalSize, WebCore::RenderingMode renderingMode, float resolutionScale, WebCore::ColorSpace colorSpace, WebCore::RenderingResourceIdentifier renderingResourceIdentifier)
- FlushDisplayList(WebKit::SharedDisplayListHandle displayList, WebCore::RenderingResourceIdentifier renderingResourceIdentifier)
+ SubmitDisplayList(WebKit::SharedDisplayListHandle displayList, WebCore::RenderingResourceIdentifier renderingResourceIdentifier)
FlushDisplayListAndCommit(WebKit::SharedDisplayListHandle displayList, WebCore::DisplayList::FlushIdentifier flushIdentifier, WebCore::RenderingResourceIdentifier renderingResourceIdentifier)
GetImageData(enum:uint8_t WebCore::AlphaPremultiplication outputFormat, WebCore::IntRect srcRect, WebCore::RenderingResourceIdentifier renderingResourceIdentifier) -> (IPC::ImageDataReference imageData) Synchronous
DidCreateSharedItemData(WebCore::DisplayList::ItemBufferIdentifier identifier, WebKit::SharedMemory::IPCHandle handle)
Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h (269605 => 269606)
--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h 2020-11-09 22:54:02 UTC (rev 269605)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h 2020-11-09 23:11:40 UTC (rev 269606)
@@ -112,7 +112,7 @@
auto& mutableThis = const_cast<RemoteImageBufferProxy&>(*this);
auto& displayList = mutableThis.m_drawingContext.displayList();
if (!displayList.isEmpty()) {
- mutableThis.flushDisplayList(displayList);
+ mutableThis.submitDisplayList(displayList);
mutableThis.m_itemCountInCurrentDisplayList = 0;
displayList.clear();
}
@@ -158,13 +158,13 @@
displayList.clear();
}
- void flushDisplayList(const WebCore::DisplayList::DisplayList& displayList) override
+ void submitDisplayList(const WebCore::DisplayList::DisplayList& displayList) override
{
if (!m_remoteRenderingBackendProxy || displayList.isEmpty())
return;
TraceScope tracingScope(FlushRemoteImageBufferStart, FlushRemoteImageBufferEnd);
- m_remoteRenderingBackendProxy->flushDisplayList(displayList, m_renderingResourceIdentifier);
+ m_remoteRenderingBackendProxy->submitDisplayList(displayList, m_renderingResourceIdentifier);
}
void willAppendItemOfType(WebCore::DisplayList::ItemType) override
@@ -175,7 +175,7 @@
return;
m_itemCountInCurrentDisplayList = 0;
- flushDisplayList(displayList);
+ submitDisplayList(displayList);
displayList.clear();
}
Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp (269605 => 269606)
--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp 2020-11-09 22:54:02 UTC (rev 269605)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp 2020-11-09 23:11:40 UTC (rev 269606)
@@ -115,9 +115,9 @@
return imageDataReference.buffer();
}
-void RemoteRenderingBackendProxy::flushDisplayList(const DisplayList::DisplayList& displayList, RenderingResourceIdentifier renderingResourceIdentifier)
+void RemoteRenderingBackendProxy::submitDisplayList(const DisplayList::DisplayList& displayList, RenderingResourceIdentifier renderingResourceIdentifier)
{
- send(Messages::RemoteRenderingBackend::FlushDisplayList({ displayList }, renderingResourceIdentifier), m_renderingBackendIdentifier);
+ send(Messages::RemoteRenderingBackend::SubmitDisplayList({ displayList }, renderingResourceIdentifier), m_renderingBackendIdentifier);
m_sharedItemBuffers.clear();
}
Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h (269605 => 269606)
--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h 2020-11-09 22:54:02 UTC (rev 269605)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h 2020-11-09 23:11:40 UTC (rev 269606)
@@ -72,7 +72,7 @@
// Messages to be sent.
RefPtr<WebCore::ImageBuffer> createImageBuffer(const WebCore::FloatSize&, WebCore::RenderingMode, float resolutionScale, WebCore::ColorSpace);
RefPtr<WebCore::ImageData> getImageData(WebCore::AlphaPremultiplication outputFormat, const WebCore::IntRect& srcRect, WebCore::RenderingResourceIdentifier);
- void flushDisplayList(const WebCore::DisplayList::DisplayList&, WebCore::RenderingResourceIdentifier);
+ void submitDisplayList(const WebCore::DisplayList::DisplayList&, WebCore::RenderingResourceIdentifier);
WebCore::DisplayList::FlushIdentifier flushDisplayListAndCommit(const WebCore::DisplayList::DisplayList&, WebCore::RenderingResourceIdentifier);
void releaseRemoteResource(WebCore::RenderingResourceIdentifier);
