Title: [275022] releases/WebKitGTK/webkit-2.32/Source/WebKit
- Revision
- 275022
- Author
- [email protected]
- Date
- 2021-03-25 07:06:44 -0700 (Thu, 25 Mar 2021)
Log Message
Merge r274423 - REGRESSION(r233845): EME Keysystem permission when MediaStream is disabled
https://bugs.webkit.org/show_bug.cgi?id=223185
Patch by Philippe Normand <[email protected]> on 2021-03-15
Reviewed by Eric Carlson.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::requestMediaKeySystemPermissionForFrame): This method is required for
EME build configurations, not MediaStream...
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog (275021 => 275022)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog 2021-03-25 14:06:40 UTC (rev 275021)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog 2021-03-25 14:06:44 UTC (rev 275022)
@@ -1,3 +1,14 @@
+2021-03-15 Philippe Normand <[email protected]>
+
+ REGRESSION(r233845): EME Keysystem permission when MediaStream is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=223185
+
+ Reviewed by Eric Carlson.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::requestMediaKeySystemPermissionForFrame): This method is required for
+ EME build configurations, not MediaStream...
+
2021-03-12 Michael Catanzaro <[email protected]>
REGRESSION(r274270): [WPE][GTK] Broke Epiphany test /embed/ephy-web-view/error-pages-not-stored-in-history
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/WebPageProxy.cpp (275021 => 275022)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-03-25 14:06:40 UTC (rev 275021)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-03-25 14:06:44 UTC (rev 275022)
@@ -8240,7 +8240,7 @@
void WebPageProxy::requestMediaKeySystemPermissionForFrame(uint64_t mediaKeySystemID, FrameIdentifier frameID, const WebCore::SecurityOriginData& topLevelDocumentOriginData, const String& keySystem)
{
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(ENCRYPTED_MEDIA)
MESSAGE_CHECK(m_process, m_process->webFrame(frameID));
auto origin = API::SecurityOrigin::create(topLevelDocumentOriginData.securityOrigin());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
