Title: [211863] releases/WebKitGTK/webkit-2.14/Source/WebCore
- Revision
- 211863
- Author
- [email protected]
- Date
- 2017-02-08 03:11:02 -0800 (Wed, 08 Feb 2017)
Log Message
Merge r211225 - [GStreamer] ASSERTION FAILED: !g_object_is_floating(ptr) in adoptGRef(GstContext* ptr)
https://bugs.webkit.org/show_bug.cgi?id=167458
Reviewed by Xabier Rodriguez-Calvar.
GstContext is a mini_object, not a GObject. Therefore it shouldn't (and can't) be checked for floatingness.
* platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
(WTF::adoptGRef): Removed incorrect assertion.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (211862 => 211863)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-02-08 11:07:50 UTC (rev 211862)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-02-08 11:11:02 UTC (rev 211863)
@@ -1,3 +1,15 @@
+2017-01-26 Enrique Ocaña González <[email protected]>
+
+ [GStreamer] ASSERTION FAILED: !g_object_is_floating(ptr) in adoptGRef(GstContext* ptr)
+ https://bugs.webkit.org/show_bug.cgi?id=167458
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ GstContext is a mini_object, not a GObject. Therefore it shouldn't (and can't) be checked for floatingness.
+
+ * platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
+ (WTF::adoptGRef): Removed incorrect assertion.
+
2017-02-07 Carlos Garcia Campos <[email protected]>
[GStreamer] Deadlock when media player is destroyed
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp (211862 => 211863)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2017-02-08 11:07:50 UTC (rev 211862)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2017-02-08 11:11:02 UTC (rev 211863)
@@ -105,7 +105,6 @@
template <> GRefPtr<GstContext> adoptGRef(GstContext* ptr)
{
- ASSERT(!g_object_is_floating(ptr));
return GRefPtr<GstContext>(ptr, GRefPtrAdopt);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
