Title: [223359] releases/WebKitGTK/webkit-2.18/Source/WebCore
- Revision
- 223359
- Author
- [email protected]
- Date
- 2017-10-16 02:50:26 -0700 (Mon, 16 Oct 2017)
Log Message
Merge r221850 - [GStreamer] Drop libgcrypt initialization in webkit_media_clear_key_decrypt_init()
https://bugs.webkit.org/show_bug.cgi?id=176656
Reviewed by Michael Catanzaro.
* platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp:
(webkit_media_clear_key_decrypt_init): Don't re-initialize libgcrypt here
since that's already done in the WebProcess main(), and the calls here
only result in libgcrypt writing out 'Oops' warnings on stderr.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (223358 => 223359)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-10-16 09:46:46 UTC (rev 223358)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-10-16 09:50:26 UTC (rev 223359)
@@ -1,3 +1,15 @@
+2017-09-10 Zan Dobersek <[email protected]>
+
+ [GStreamer] Drop libgcrypt initialization in webkit_media_clear_key_decrypt_init()
+ https://bugs.webkit.org/show_bug.cgi?id=176656
+
+ Reviewed by Michael Catanzaro.
+
+ * platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp:
+ (webkit_media_clear_key_decrypt_init): Don't re-initialize libgcrypt here
+ since that's already done in the WebProcess main(), and the calls here
+ only result in libgcrypt writing out 'Oops' warnings on stderr.
+
2017-09-07 Darin Adler <[email protected]>
Fix double resolve assertion in FontFaceSet seen while running tests
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp (223358 => 223359)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp 2017-10-16 09:46:46 UTC (rev 223358)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp 2017-10-16 09:50:26 UTC (rev 223359)
@@ -97,15 +97,6 @@
{
WebKitMediaClearKeyDecryptPrivate* priv = WEBKIT_MEDIA_CK_DECRYPT_GET_PRIVATE(self);
- if (!gcry_check_version(GCRYPT_VERSION))
- GST_ERROR_OBJECT(self, "Libgcrypt failed to initialize");
-
- // Allocate a pool of 16k secure memory. This make the secure memory
- // available and also drops privileges where needed.
- gcry_control(GCRYCTL_INIT_SECMEM, 16384, 0);
-
- gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
-
self->priv = priv;
new (priv) WebKitMediaClearKeyDecryptPrivate();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
