Changeset 276709 in webkit

Timestamp:

Apr 28, 2021, 7:31:34 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

Merge r275654 - Unreviewed. Fixed build warning.

• platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h: Avoid C-linkage warning.

Location:

releases/WebKitGTK/webkit-2.32/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h (modified) (2 diffs)

releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-08  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        Unreviewed. Fixed build warning.
+
+        * platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h: Avoid C-linkage warning.
+
 2021-04-07  Enrique Ocaña González  <eocanha@igalia.com>
 

releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h

@@ -48 +48 @@
 
 bool webKitMediaCommonEncryptionDecryptIsFlushing(WebKitMediaCommonEncryptionDecrypt*);
-WeakPtr<WebCore::CDMProxyDecryptionClient> webKitMediaCommonEncryptionDecryptGetCDMProxyDecryptionClient(WebKitMediaCommonEncryptionDecrypt*);
 
 struct _WebKitMediaCommonEncryptionDecrypt {
@@ -66 +65 @@
 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)