Title: [275654] trunk/Source/WebCore
- Revision
- 275654
- Author
- calva...@igalia.com
- Date
- 2021-04-08 01:38:57 -0700 (Thu, 08 Apr 2021)
Log Message
Unreviewed. Fixed build warning.
* platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h: Avoid C-linkage warning.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (275653 => 275654)
--- trunk/Source/WebCore/ChangeLog 2021-04-08 05:48:03 UTC (rev 275653)
+++ trunk/Source/WebCore/ChangeLog 2021-04-08 08:38:57 UTC (rev 275654)
@@ -1,3 +1,9 @@
+2021-04-08 Xabier Rodriguez Calvar <calva...@igalia.com>
+
+ Unreviewed. Fixed build warning.
+
+ * platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h: Avoid C-linkage warning.
+
2021-04-07 Julian Gonzalez <julian_a_gonza...@apple.com>
Nullptr dereference in ReplaceSelectionCommand::removeRedundantStylesAndKeepStyleSpanInline
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h (275653 => 275654)
--- trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h 2021-04-08 05:48:03 UTC (rev 275653)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h 2021-04-08 08:38:57 UTC (rev 275654)
@@ -47,7 +47,6 @@
GType webkit_media_common_encryption_decrypt_get_type(void);
bool webKitMediaCommonEncryptionDecryptIsFlushing(WebKitMediaCommonEncryptionDecrypt*);
-WeakPtr<WebCore::CDMProxyDecryptionClient> webKitMediaCommonEncryptionDecryptGetCDMProxyDecryptionClient(WebKitMediaCommonEncryptionDecrypt*);
struct _WebKitMediaCommonEncryptionDecrypt {
GstBaseTransform parent;
@@ -65,4 +64,8 @@
G_END_DECLS
+// This function returns a C++ type. It's internal to the decryptors so it is safe to move it here to avoid the C++ return warning because of the C only linkage
+// area.
+WeakPtr<WebCore::CDMProxyDecryptionClient> webKitMediaCommonEncryptionDecryptGetCDMProxyDecryptionClient(WebKitMediaCommonEncryptionDecrypt*);
+
#endif // ENABLE(ENCRYPTED_MEDIA) && USE(GSTREAMER)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
