Title: [98731] trunk/Source/WebCore
- Revision
- 98731
- Author
- [email protected]
- Date
- 2011-10-28 09:47:14 -0700 (Fri, 28 Oct 2011)
Log Message
[GTK] Build fixes for glib 2.31 (current master)
https://bugs.webkit.org/show_bug.cgi?id=70679
Reviewed by Martin Robinson.
g_cond_new and g_mutex_new have been replaced by _init
functions. Same for _free, replaced by _clear.
* platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
(webkit_video_sink_init):
(webkit_video_sink_dispose):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (98730 => 98731)
--- trunk/Source/WebCore/ChangeLog 2011-10-28 16:29:26 UTC (rev 98730)
+++ trunk/Source/WebCore/ChangeLog 2011-10-28 16:47:14 UTC (rev 98731)
@@ -1,3 +1,17 @@
+2011-10-22 Philippe Normand <[email protected]>
+
+ [GTK] Build fixes for glib 2.31 (current master)
+ https://bugs.webkit.org/show_bug.cgi?id=70679
+
+ Reviewed by Martin Robinson.
+
+ g_cond_new and g_mutex_new have been replaced by _init
+ functions. Same for _free, replaced by _clear.
+
+ * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
+ (webkit_video_sink_init):
+ (webkit_video_sink_dispose):
+
2011-10-28 Jochen Eisinger <[email protected]>
Rename a number of methods mentioning _javascript_ to just Script instead
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp (98730 => 98731)
--- trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2011-10-28 16:29:26 UTC (rev 98730)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2011-10-28 16:47:14 UTC (rev 98731)
@@ -33,6 +33,7 @@
#include <glib.h>
#include <gst/gst.h>
#include <gst/video/video.h>
+#include <wtf/FastAllocBase.h>
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE("sink",
GST_PAD_SINK, GST_PAD_ALWAYS,
@@ -105,8 +106,15 @@
WebKitVideoSinkPrivate* priv;
sink->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE(sink, WEBKIT_TYPE_VIDEO_SINK, WebKitVideoSinkPrivate);
+#if GLIB_CHECK_VERSION(2, 31, 0)
+ priv->data_cond = WTF::fastNew<GCond>();
+ g_cond_init(priv->data_cond);
+ priv->buffer_mutex = WTF::fastNew<GMutex>();
+ g_mutex_init(priv->buffer_mutex);
+#else
priv->data_cond = g_cond_new();
priv->buffer_mutex = g_mutex_new();
+#endif
}
static gboolean
@@ -242,12 +250,22 @@
WebKitVideoSinkPrivate* priv = sink->priv;
if (priv->data_cond) {
+#if GLIB_CHECK_VERSION(2, 31, 0)
+ g_cond_clear(priv->data_cond);
+ WTF::fastDelete(priv->data_cond);
+#else
g_cond_free(priv->data_cond);
+#endif
priv->data_cond = 0;
}
if (priv->buffer_mutex) {
+#if GLIB_CHECK_VERSION(2, 31, 0)
+ g_mutex_clear(priv->buffer_mutex);
+ WTF::fastDelete(priv->buffer_mutex);
+#else
g_mutex_free(priv->buffer_mutex);
+#endif
priv->buffer_mutex = 0;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
