- Revision
- 270286
- Author
- [email protected]
- Date
- 2020-12-01 00:24:41 -0800 (Tue, 01 Dec 2020)
Log Message
GPU Process: Invalid static_cast from ConcreteImageBuffer to RemoteImageBufferProxy
https://bugs.webkit.org/show_bug.cgi?id=219387
Reviewed by Ryosuke Niwa.
* Shared/ConcreteShareableImageBuffer.h: Copied from Source/WebKit/WebProcess/GPU/graphics/cocoa/ImageBufferShareableIOSurfaceBackend.h.
(WebKit::ConcreteShareableImageBuffer::create):
(WebKit::ConcreteShareableImageBuffer::ConcreteShareableImageBuffer):
(WebKit::ConcreteShareableImageBuffer::createImageBufferBackendHandle):
* Shared/RemoteLayerTree/RemoteLayerBackingStore.mm:
(WebKit::RemoteLayerBackingStore::encode const):
(WebKit::RemoteLayerBackingStore::swapToValidFrontBuffer):
* WebKit.xcodeproj/project.pbxproj:
Add and adopt ConcreteShareableImageBuffer. This is a ConcreteImageBuffer that knows how
to create an ImageBufferBackendHandle, with no other behavior change.
Previously, we were (completely incorrectly) casting ConcreteImageBuffer to RemoteImageBufferProxy
to get this behavior, and somehow just got very lucky.
* WebProcess/GPU/media/RemoteAudioSession.cpp:
Fix some unified source issues.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (270285 => 270286)
--- trunk/Source/WebKit/ChangeLog 2020-12-01 07:02:13 UTC (rev 270285)
+++ trunk/Source/WebKit/ChangeLog 2020-12-01 08:24:41 UTC (rev 270286)
@@ -1,3 +1,26 @@
+2020-12-01 Tim Horton <[email protected]>
+
+ GPU Process: Invalid static_cast from ConcreteImageBuffer to RemoteImageBufferProxy
+ https://bugs.webkit.org/show_bug.cgi?id=219387
+
+ Reviewed by Ryosuke Niwa.
+
+ * Shared/ConcreteShareableImageBuffer.h: Copied from Source/WebKit/WebProcess/GPU/graphics/cocoa/ImageBufferShareableIOSurfaceBackend.h.
+ (WebKit::ConcreteShareableImageBuffer::create):
+ (WebKit::ConcreteShareableImageBuffer::ConcreteShareableImageBuffer):
+ (WebKit::ConcreteShareableImageBuffer::createImageBufferBackendHandle):
+ * Shared/RemoteLayerTree/RemoteLayerBackingStore.mm:
+ (WebKit::RemoteLayerBackingStore::encode const):
+ (WebKit::RemoteLayerBackingStore::swapToValidFrontBuffer):
+ * WebKit.xcodeproj/project.pbxproj:
+ Add and adopt ConcreteShareableImageBuffer. This is a ConcreteImageBuffer that knows how
+ to create an ImageBufferBackendHandle, with no other behavior change.
+ Previously, we were (completely incorrectly) casting ConcreteImageBuffer to RemoteImageBufferProxy
+ to get this behavior, and somehow just got very lucky.
+
+ * WebProcess/GPU/media/RemoteAudioSession.cpp:
+ Fix some unified source issues.
+
2020-11-30 Per Arne Vollan <[email protected]>
[macOS] Adopt SPI to prevent establishing XPC connections to Launch Services
Added: trunk/Source/WebKit/Shared/ConcreteShareableImageBuffer.h (0 => 270286)
--- trunk/Source/WebKit/Shared/ConcreteShareableImageBuffer.h (rev 0)
+++ trunk/Source/WebKit/Shared/ConcreteShareableImageBuffer.h 2020-12-01 08:24:41 UTC (rev 270286)
@@ -0,0 +1,55 @@
+/*
+ * 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. ``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
+ * 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 "ImageBufferBackendHandle.h"
+#include <WebCore/ConcreteImageBuffer.h>
+
+namespace WebKit {
+
+template<typename BackendType>
+class ConcreteShareableImageBuffer : public WebCore::ConcreteImageBuffer<BackendType> {
+ using BaseConcreteImageBuffer = WebCore::ConcreteImageBuffer<BackendType>;
+ using BaseConcreteImageBuffer::m_backend;
+
+public:
+ static auto create(const WebCore::FloatSize& size, WebCore::RenderingMode renderingMode, float resolutionScale, WebCore::ColorSpace colorSpace, WebCore::PixelFormat pixelFormat)
+ {
+ return BaseConcreteImageBuffer::template create<ConcreteShareableImageBuffer>(size, resolutionScale, colorSpace, pixelFormat, nullptr);
+ }
+
+ ConcreteShareableImageBuffer(std::unique_ptr<BackendType>&& backend)
+ : BaseConcreteImageBuffer(WTFMove(backend))
+ {
+ }
+
+ ImageBufferBackendHandle createImageBufferBackendHandle()
+ {
+ return m_backend->createImageBufferBackendHandle();
+ }
+};
+
+} // namespace WebKit
Modified: trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm (270285 => 270286)
--- trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm 2020-12-01 07:02:13 UTC (rev 270285)
+++ trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm 2020-12-01 08:24:41 UTC (rev 270286)
@@ -27,6 +27,7 @@
#import "RemoteLayerBackingStore.h"
#import "ArgumentCoders.h"
+#import "ConcreteShareableImageBuffer.h"
#import "MachPort.h"
#import "PlatformCALayerRemote.h"
#import "PlatformRemoteImageBufferProxy.h"
@@ -105,10 +106,17 @@
Optional<ImageBufferBackendHandle> handle;
if (m_frontBuffer.imageBuffer) {
// FIXME: We need to flatten the class hierarchy so we can avoid this bifurcation.
- if (m_acceleratesDrawing)
- handle = static_cast<AcceleratedRemoteImageBufferProxy *>(m_frontBuffer.imageBuffer.get())->createImageBufferBackendHandle();
- else
- handle = static_cast<UnacceleratedRemoteImageBufferProxy *>(m_frontBuffer.imageBuffer.get())->createImageBufferBackendHandle();
+ if (WebProcess::singleton().shouldUseRemoteRenderingFor(WebCore::RenderingPurpose::DOM)) {
+ if (m_acceleratesDrawing)
+ handle = static_cast<AcceleratedRemoteImageBufferProxy *>(m_frontBuffer.imageBuffer.get())->createImageBufferBackendHandle();
+ else
+ handle = static_cast<UnacceleratedRemoteImageBufferProxy *>(m_frontBuffer.imageBuffer.get())->createImageBufferBackendHandle();
+ } else {
+ if (m_acceleratesDrawing)
+ handle = static_cast<ConcreteShareableImageBuffer<AcceleratedImageBufferShareableBackend> *>(m_frontBuffer.imageBuffer.get())->createImageBufferBackendHandle();
+ else
+ handle = static_cast<ConcreteShareableImageBuffer<UnacceleratedImageBufferShareableBackend> *>(m_frontBuffer.imageBuffer.get())->createImageBufferBackendHandle();
+ }
}
encoder << handle;
@@ -185,9 +193,9 @@
}
if (m_acceleratesDrawing)
- m_frontBuffer.imageBuffer = WebCore::ConcreteImageBuffer<AcceleratedImageBufferShareableBackend>::create(backingStoreSize(), 1, WebCore::ColorSpace::SRGB, pixelFormat(), nullptr);
+ m_frontBuffer.imageBuffer = ConcreteShareableImageBuffer<AcceleratedImageBufferShareableBackend>::create(backingStoreSize(), WebCore::RenderingMode::Accelerated, 1, WebCore::ColorSpace::SRGB, pixelFormat());
else
- m_frontBuffer.imageBuffer = WebCore::ConcreteImageBuffer<UnacceleratedImageBufferShareableBackend>::create(backingStoreSize(), 1, WebCore::ColorSpace::SRGB, pixelFormat(), nullptr);
+ m_frontBuffer.imageBuffer = ConcreteShareableImageBuffer<UnacceleratedImageBufferShareableBackend>::create(backingStoreSize(), WebCore::RenderingMode::Unaccelerated, 1, WebCore::ColorSpace::SRGB, pixelFormat());
}
bool RemoteLayerBackingStore::display()
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (270285 => 270286)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-12-01 07:02:13 UTC (rev 270285)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-12-01 08:24:41 UTC (rev 270286)
@@ -2951,6 +2951,7 @@
2D1B5D5C185869C8006C6596 /* ViewGestureControllerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewGestureControllerMessages.h; path = DerivedSources/WebKit2/ViewGestureControllerMessages.h; sourceTree = BUILT_PRODUCTS_DIR; };
2D1E8221216FFF5000A15265 /* WKWebEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKWebEvent.h; path = ios/WKWebEvent.h; sourceTree = "<group>"; };
2D1E8222216FFF5100A15265 /* WKWebEvent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKWebEvent.mm; path = ios/WKWebEvent.mm; sourceTree = "<group>"; };
+ 2D25F3272575872400231A8B /* ConcreteShareableImageBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ConcreteShareableImageBuffer.h; sourceTree = "<group>"; };
2D28A4951AF965A100F190C9 /* WKViewLayoutStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKViewLayoutStrategy.h; sourceTree = "<group>"; };
2D28A4961AF965A100F190C9 /* WKViewLayoutStrategy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKViewLayoutStrategy.mm; sourceTree = "<group>"; };
2D28F3E01885CCC1004B9EAE /* WebChromeClientIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebChromeClientIOS.mm; path = ios/WebChromeClientIOS.mm; sourceTree = "<group>"; };
@@ -6244,6 +6245,7 @@
BCF18637167D071E00A1A85A /* CacheModel.cpp */,
BC3065F91259344E00E71278 /* CacheModel.h */,
9BC59D6C1EFCCCB6001E8D09 /* CallbackID.h */,
+ 2D25F3272575872400231A8B /* ConcreteShareableImageBuffer.h */,
CA05397823EE324400A553DC /* ContentAsStringIncludesChildFrames.h */,
5129EB1123D0DE7800AF1CD7 /* ContentWorldShared.h */,
5106D7BF18BDBE73000AB166 /* ContextMenuContextData.cpp */,
Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSession.cpp (270285 => 270286)
--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSession.cpp 2020-12-01 07:02:13 UTC (rev 270285)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioSession.cpp 2020-12-01 08:24:41 UTC (rev 270286)
@@ -29,9 +29,11 @@
#if ENABLE(GPU_PROCESS) && USE(AUDIO_SESSION)
#include "GPUConnectionToWebProcessMessages.h"
+#include "GPUProcessConnection.h"
#include "GPUProcessProxy.h"
#include "RemoteAudioSessionMessages.h"
#include "RemoteAudioSessionProxyMessages.h"
+#include "WebProcess.h"
#include <WebCore/PlatformMediaSessionManager.h>
namespace WebKit {
