Title: [290626] trunk/Source/WebKit
- Revision
- 290626
- Author
- ross.kirsl...@sony.com
- Date
- 2022-02-28 19:13:33 -0800 (Mon, 28 Feb 2022)
Log Message
REGRESSION(r290470): CDMInstanceSession::setLogIdentifier must be guarded with !RELEASE_LOG_DISABLED
https://bugs.webkit.org/show_bug.cgi?id=237302
Unreviewed build fix.
* GPUProcess/media/RemoteCDMInstanceSessionProxy.cpp:
(WebKit::RemoteCDMInstanceSessionProxy::setLogIdentifier):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (290625 => 290626)
--- trunk/Source/WebKit/ChangeLog 2022-03-01 03:00:08 UTC (rev 290625)
+++ trunk/Source/WebKit/ChangeLog 2022-03-01 03:13:33 UTC (rev 290626)
@@ -1,3 +1,13 @@
+2022-02-28 Ross Kirsling <ross.kirsl...@sony.com>
+
+ REGRESSION(r290470): CDMInstanceSession::setLogIdentifier must be guarded with !RELEASE_LOG_DISABLED
+ https://bugs.webkit.org/show_bug.cgi?id=237302
+
+ Unreviewed build fix.
+
+ * GPUProcess/media/RemoteCDMInstanceSessionProxy.cpp:
+ (WebKit::RemoteCDMInstanceSessionProxy::setLogIdentifier):
+
2022-02-28 Sihui Liu <sihui_...@apple.com>
[macOS] TestWebKitAPI.WebKit.MigrateLocalStorageDataToGeneralStorageDirectory is a flaky failure
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteCDMInstanceSessionProxy.cpp (290625 => 290626)
--- trunk/Source/WebKit/GPUProcess/media/RemoteCDMInstanceSessionProxy.cpp 2022-03-01 03:00:08 UTC (rev 290625)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteCDMInstanceSessionProxy.cpp 2022-03-01 03:13:33 UTC (rev 290626)
@@ -59,7 +59,11 @@
void RemoteCDMInstanceSessionProxy::setLogIdentifier(uint64_t logIdentifier)
{
+#if !RELEASE_LOG_DISABLED
m_session->setLogIdentifier(reinterpret_cast<const void*>(logIdentifier));
+#else
+ UNUSED_PARAM(logIdentifier);
+#endif
}
void RemoteCDMInstanceSessionProxy::requestLicense(LicenseType type, AtomString initDataType, IPC::SharedBufferCopy&& initData, LicenseCallback&& completion)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
