Skip to content

Commit

Permalink
Fix warnings in GPU Process code when RELEASE_LOG_DISABLED
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=259003

Reviewed by Chris Dumez.

Guard code with checks for whether `RELEASE_LOG_DISABLED` is enabled.

* Source/WebKit/WebProcess/GPU/graphics/RemoteDisplayListRecorderProxy.cpp:
(WebKit::RemoteDisplayListRecorderProxy::send):
(WebKit::RemoteDisplayListRecorderProxy::sendSync):
* Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.cpp:
(WebKit::RemoteImageBufferProxy::ensureBackendCreated const):

Canonical link: https://commits.webkit.org/265950@main
  • Loading branch information
donny-dont committed Jul 11, 2023
1 parent 5d22a55 commit 5102c8f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,15 @@ ALWAYS_INLINE void RemoteDisplayListRecorderProxy::send(T&& message)

m_imageBuffer->backingStoreWillChange();
auto result = m_renderingBackend->streamConnection().send(WTFMove(message), m_destinationBufferIdentifier, RemoteRenderingBackendProxy::defaultTimeout);
#if !RELEASE_LOG_DISABLED
if (UNLIKELY(result != IPC::Error::NoError)) {
auto& parameters = m_renderingBackend->parameters();
RELEASE_LOG(RemoteLayerBuffers, "[pageProxyID=%" PRIu64 ", webPageID=%" PRIu64 ", renderingBackend=%" PRIu64 "] RemoteDisplayListRecorderProxy::send - failed, name:%" PUBLIC_LOG_STRING ", error:%" PUBLIC_LOG_STRING,
parameters.pageProxyID.toUInt64(), parameters.pageID.toUInt64(), parameters.identifier.toUInt64(), IPC::description(T::name()), IPC::errorAsString(result));
}
#else
UNUSED_VARIABLE(result);
#endif
}

template<typename T>
Expand All @@ -90,11 +94,15 @@ ALWAYS_INLINE void RemoteDisplayListRecorderProxy::sendSync(T&& message)

m_imageBuffer->backingStoreWillChange();
auto result = m_renderingBackend->streamConnection().sendSync(WTFMove(message), m_destinationBufferIdentifier, RemoteRenderingBackendProxy::defaultTimeout);
#if !RELEASE_LOG_DISABLED
if (UNLIKELY(!result.succeeded())) {
auto& parameters = m_renderingBackend->parameters();
RELEASE_LOG(RemoteLayerBuffers, "[pageProxyID=%" PRIu64 ", webPageID=%" PRIu64 ", renderingBackend=%" PRIu64 "] RemoteDisplayListRecorderProxy::sendSync - failed, name:%" PUBLIC_LOG_STRING ", error:%" PUBLIC_LOG_STRING,
parameters.pageProxyID.toUInt64(), parameters.pageID.toUInt64(), parameters.identifier.toUInt64(), IPC::description(T::name()), IPC::errorAsString(result.error));
}
#else
UNUSED_VARIABLE(result);
#endif
}

RenderingMode RemoteDisplayListRecorderProxy::renderingMode() const
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ ImageBufferBackend* RemoteImageBufferProxy::ensureBackendCreated() const
if (!m_backend && m_remoteRenderingBackendProxy) {
auto error = streamConnection().waitForAndDispatchImmediately<Messages::RemoteImageBufferProxy::DidCreateBackend>(m_renderingResourceIdentifier, RemoteRenderingBackendProxy::defaultTimeout);
if (error != IPC::Error::NoError) {
#if !RELEASE_LOG_DISABLED
auto& parameters = m_remoteRenderingBackendProxy->parameters();
#endif
RELEASE_LOG(RemoteLayerBuffers, "[pageProxyID=%" PRIu64 ", webPageID=%" PRIu64 ", renderingBackend=%" PRIu64 "] RemoteImageBufferProxy::ensureBackendCreated - waitForAndDispatchImmediately returned error: %" PUBLIC_LOG_STRING,
parameters.pageProxyID.toUInt64(), parameters.pageID.toUInt64(), parameters.identifier.toUInt64(), IPC::errorAsString(error));
return nullptr;
Expand Down

0 comments on commit 5102c8f

Please sign in to comment.