Title: [218870] trunk/Source/WebCore
Revision
218870
Author
carlo...@webkit.org
Date
2017-06-28 00:20:23 -0700 (Wed, 28 Jun 2017)

Log Message

REGRESSION(r218799): [GTK][WPE] Critical warning at exit
https://bugs.webkit.org/show_bug.cgi?id=173907

Reviewed by Konstantin Tokarev.

GLib-GObject-CRITICAL **: g_object_unref: assertion 'G_IS_OBJECT (object)' failed

This is now always happening when closing the MeiniBrowser and it's causing a lot of unit tests to fail. In
r218799, GRefPtrGtk.h include was removed from PasteboardHelper.h that contains a GRefPtr<GtkTargetList>. The
targets are destroyed at exit, but now trying to use g_object_unref instead of gtk_target_list_unref(). I've
found two more cases like this in r218799, that removes GUniquePtrSoup.h from ResourceHandleInternal.h and
ResourceRequest.h that have GUniquePtr<SoupBuffer> and GUniquePtr<SoupURI>.

Fixes several GTK+ and WPE unit tests.

* platform/gtk/PasteboardHelper.h: Bring back GRefPtrGtk.h.
* platform/network/ResourceHandleInternal.h: Bring back GUniquePtrSoup.h.
* platform/network/soup/ResourceRequest.h: Ditto.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (218869 => 218870)


--- trunk/Source/WebCore/ChangeLog	2017-06-28 07:11:57 UTC (rev 218869)
+++ trunk/Source/WebCore/ChangeLog	2017-06-28 07:20:23 UTC (rev 218870)
@@ -1,3 +1,24 @@
+2017-06-28  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        REGRESSION(r218799): [GTK][WPE] Critical warning at exit
+        https://bugs.webkit.org/show_bug.cgi?id=173907
+
+        Reviewed by Konstantin Tokarev.
+
+        GLib-GObject-CRITICAL **: g_object_unref: assertion 'G_IS_OBJECT (object)' failed
+
+        This is now always happening when closing the MeiniBrowser and it's causing a lot of unit tests to fail. In
+        r218799, GRefPtrGtk.h include was removed from PasteboardHelper.h that contains a GRefPtr<GtkTargetList>. The
+        targets are destroyed at exit, but now trying to use g_object_unref instead of gtk_target_list_unref(). I've
+        found two more cases like this in r218799, that removes GUniquePtrSoup.h from ResourceHandleInternal.h and
+        ResourceRequest.h that have GUniquePtr<SoupBuffer> and GUniquePtr<SoupURI>.
+
+        Fixes several GTK+ and WPE unit tests.
+
+        * platform/gtk/PasteboardHelper.h: Bring back GRefPtrGtk.h.
+        * platform/network/ResourceHandleInternal.h: Bring back GUniquePtrSoup.h.
+        * platform/network/soup/ResourceRequest.h: Ditto.
+
 2017-06-27  Chris Dumez  <cdu...@apple.com>
 
         [ResourceLoadStatistics] Update minimumTimeBetweeenDataRecordsRemoval to 1 hour instead of 1 minute

Modified: trunk/Source/WebCore/platform/gtk/PasteboardHelper.h (218869 => 218870)


--- trunk/Source/WebCore/platform/gtk/PasteboardHelper.h	2017-06-28 07:11:57 UTC (rev 218869)
+++ trunk/Source/WebCore/platform/gtk/PasteboardHelper.h	2017-06-28 07:20:23 UTC (rev 218870)
@@ -25,10 +25,10 @@
 #ifndef PasteboardHelper_h
 #define PasteboardHelper_h
 
+#include "GRefPtrGtk.h"
 #include <wtf/Function.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/Vector.h>
-#include <wtf/glib/GRefPtr.h>
 
 namespace WebCore {
 

Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (218869 => 218870)


--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h	2017-06-28 07:11:57 UTC (rev 218869)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h	2017-06-28 07:20:23 UTC (rev 218870)
@@ -49,6 +49,7 @@
 #endif
 
 #if USE(SOUP)
+#include "GUniquePtrSoup.h"
 #include "SoupNetworkSession.h"
 #include <libsoup/soup.h>
 #include <wtf/RunLoop.h>

Modified: trunk/Source/WebCore/platform/network/soup/ResourceRequest.h (218869 => 218870)


--- trunk/Source/WebCore/platform/network/soup/ResourceRequest.h	2017-06-28 07:11:57 UTC (rev 218869)
+++ trunk/Source/WebCore/platform/network/soup/ResourceRequest.h	2017-06-28 07:20:23 UTC (rev 218870)
@@ -27,6 +27,7 @@
 #ifndef ResourceRequest_h
 #define ResourceRequest_h
 
+#include "GUniquePtrSoup.h"
 #include "ResourceRequestBase.h"
 #include <libsoup/soup.h>
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to