Title: [287436] trunk/Source/WebKit
- Revision
- 287436
- Author
- [email protected]
- Date
- 2021-12-25 02:13:53 -0800 (Sat, 25 Dec 2021)
Log Message
Unreviewed, reverting r285088.
https://bugs.webkit.org/show_bug.cgi?id=234680
>From A/B test, we probably need to revert both, 285087 and
285088
Reverted changeset:
"Web process shouldn't crash if
ImageBuffer::ensureBackendCreated() fails"
https://bugs.webkit.org/show_bug.cgi?id=232520
https://commits.webkit.org/r285088
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (287435 => 287436)
--- trunk/Source/WebKit/ChangeLog 2021-12-25 02:22:06 UTC (rev 287435)
+++ trunk/Source/WebKit/ChangeLog 2021-12-25 10:13:53 UTC (rev 287436)
@@ -1,3 +1,18 @@
+2021-12-25 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r285088.
+ https://bugs.webkit.org/show_bug.cgi?id=234680
+
+ From A/B test, we probably need to revert both, 285087 and
+ 285088
+
+ Reverted changeset:
+
+ "Web process shouldn't crash if
+ ImageBuffer::ensureBackendCreated() fails"
+ https://bugs.webkit.org/show_bug.cgi?id=232520
+ https://commits.webkit.org/r285088
+
2021-12-24 Simon Fraser <[email protected]>
Apply the scroll delta in the "began" wheel event
Modified: trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm (287435 => 287436)
--- trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm 2021-12-25 02:22:06 UTC (rev 287435)
+++ trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm 2021-12-25 10:13:53 UTC (rev 287436)
@@ -122,16 +122,13 @@
} else if (m_frontBuffer.imageBuffer) {
switch (m_type) {
case Type::IOSurface:
- if (auto* backend = m_frontBuffer.imageBuffer->ensureBackendCreated()) {
- if (m_frontBuffer.imageBuffer->canMapBackingStore())
- handle = static_cast<AcceleratedImageBufferShareableMappedBackend&>(*backend).createImageBufferBackendHandle();
- else
- handle = static_cast<AcceleratedImageBufferShareableBackend&>(*backend).createImageBufferBackendHandle();
- }
+ if (m_frontBuffer.imageBuffer->canMapBackingStore())
+ handle = static_cast<AcceleratedImageBufferShareableMappedBackend&>(*m_frontBuffer.imageBuffer->ensureBackendCreated()).createImageBufferBackendHandle();
+ else
+ handle = static_cast<AcceleratedImageBufferShareableBackend&>(*m_frontBuffer.imageBuffer->ensureBackendCreated()).createImageBufferBackendHandle();
break;
case Type::Bitmap:
- if (auto* backend = m_frontBuffer.imageBuffer->ensureBackendCreated())
- handle = static_cast<UnacceleratedImageBufferShareableBackend&>(*backend).createImageBufferBackendHandle();
+ handle = static_cast<UnacceleratedImageBufferShareableBackend&>(*m_frontBuffer.imageBuffer->ensureBackendCreated()).createImageBufferBackendHandle();
break;
}
}
@@ -140,10 +137,8 @@
#if ENABLE(CG_DISPLAY_LIST_BACKED_IMAGE_BUFFER)
std::optional<ImageBufferBackendHandle> displayListHandle;
- if (m_frontBuffer.displayListImageBuffer) {
- if (auto* backend = m_frontBuffer.displayListImageBuffer->ensureBackendCreated())
- displayListHandle = static_cast<CGDisplayListImageBufferBackend&>(*backend).createImageBufferBackendHandle();
- }
+ if (m_frontBuffer.displayListImageBuffer)
+ displayListHandle = static_cast<CGDisplayListImageBufferBackend&>(*m_frontBuffer.displayListImageBuffer->ensureBackendCreated()).createImageBufferBackendHandle();
encoder << displayListHandle;
#endif
Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h (287435 => 287436)
--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h 2021-12-25 02:22:06 UTC (rev 287435)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h 2021-12-25 10:13:53 UTC (rev 287436)
@@ -75,9 +75,8 @@
ImageBufferBackendHandle createImageBufferBackendHandle()
{
- if (ensureBackendCreated())
- return m_backend->createImageBufferBackendHandle();
- return { };
+ ensureBackendCreated();
+ return m_backend->createImageBufferBackendHandle();
}
WebCore::GraphicsContextFlushIdentifier lastSentFlushIdentifier() const { return m_sentFlushIdentifier; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
