Title: [101130] trunk/Source/WebCore
- Revision
- 101130
- Author
- [email protected]
- Date
- 2011-11-24 01:47:02 -0800 (Thu, 24 Nov 2011)
Log Message
Fix ASSERTs added in r101082.
Rubber-Stamped by Martin Robinson.
* platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
(WTF::adoptGRef): Check for valid pointer before
GST_OBJECT_IS_FLOATING().
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101129 => 101130)
--- trunk/Source/WebCore/ChangeLog 2011-11-24 09:37:27 UTC (rev 101129)
+++ trunk/Source/WebCore/ChangeLog 2011-11-24 09:47:02 UTC (rev 101130)
@@ -1,3 +1,13 @@
+2011-11-24 Philippe Normand <[email protected]>
+
+ Fix ASSERTs added in r101082.
+
+ Rubber-Stamped by Martin Robinson.
+
+ * platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
+ (WTF::adoptGRef): Check for valid pointer before
+ GST_OBJECT_IS_FLOATING().
+
2011-11-23 Alexander Pavlov <[email protected]>
Web Inspector: shift focus to the source view when a resource is selected in the Scripts panel
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp (101129 => 101130)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2011-11-24 09:37:27 UTC (rev 101129)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2011-11-24 09:47:02 UTC (rev 101130)
@@ -27,7 +27,7 @@
template <> GRefPtr<GstElement> adoptGRef(GstElement* ptr)
{
- ASSERT(!GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
+ ASSERT(!ptr || !GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
return GRefPtr<GstElement>(ptr, GRefPtrAdopt);
}
@@ -49,7 +49,7 @@
template <> GRefPtr<GstPad> adoptGRef(GstPad* ptr)
{
- ASSERT(!GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
+ ASSERT(!ptr || !GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
return GRefPtr<GstPad>(ptr, GRefPtrAdopt);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
