Title: [257449] releases/WebKitGTK/webkit-2.28/Source/WebCore
Revision
257449
Author
[email protected]
Date
2020-02-26 02:57:38 -0800 (Wed, 26 Feb 2020)

Log Message

Merge r257133 - [GStreamer] TextCombinerGStreamer is failing to compile with Gst1.14
https://bugs.webkit.org/show_bug.cgi?id=208041

Reviewed by Xabier Rodriguez-Calvar.

Replace usage of gst_clear_object and gst_clear_tag_list with previous
*_unref functions. The clear versions were added in 1.16 while Ubuntu
18.04 (current LTS) and Debian stable uses 1.14.

* platform/graphics/gstreamer/TextCombinerGStreamer.cpp:
(webkitTextCombinerPadDispose):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog (257448 => 257449)


--- releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog	2020-02-26 10:57:34 UTC (rev 257448)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog	2020-02-26 10:57:38 UTC (rev 257449)
@@ -1,3 +1,17 @@
+2020-02-21  Lauro Moura  <[email protected]>
+
+        [GStreamer] TextCombinerGStreamer is failing to compile with Gst1.14
+        https://bugs.webkit.org/show_bug.cgi?id=208041
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        Replace usage of gst_clear_object and gst_clear_tag_list with previous
+        *_unref functions. The clear versions were added in 1.16 while Ubuntu
+        18.04 (current LTS) and Debian stable uses 1.14.
+
+        * platform/graphics/gstreamer/TextCombinerGStreamer.cpp:
+        (webkitTextCombinerPadDispose):
+
 2020-02-21  Carlos Alberto Lopez Perez  <[email protected]>
 
         Value sanitization for input[type=text] should not truncate a value at a control character

Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp (257448 => 257449)


--- releases/WebKitGTK/webkit-2.28/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp	2020-02-26 10:57:34 UTC (rev 257448)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp	2020-02-26 10:57:38 UTC (rev 257449)
@@ -103,8 +103,8 @@
 static void webkitTextCombinerPadDispose(GObject* object)
 {
     WebKitTextCombinerPad* combinerPad = WEBKIT_TEXT_COMBINER_PAD(object);
-    gst_clear_tag_list(&combinerPad->tags);
-    gst_clear_object(&combinerPad->funnelPad);
+    g_clear_pointer(&combinerPad->tags, gst_tag_list_unref);
+    g_clear_pointer(&combinerPad->funnelPad, gst_object_unref);
     G_OBJECT_CLASS(webkit_text_combiner_pad_parent_class)->dispose(object);
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to