Changeset 122233 in webkit

Timestamp:

Jul 10, 2012 10:05:24 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Fix memory leaks by adopting allocation of GdkPixbuf
​https://bugs.webkit.org/show_bug.cgi?id=90790

Patch by Sudarsana Nagineni <​sudarsana.nagineni@linux.intel.com> on 2012-07-10
Reviewed by Carlos Garcia Campos.

Source/WebCore:

Fixed a memory leak in paintGdkPixbuf by adopting an allocation
of GdkPixbuf.

No new tests. No change in behavior.

• platform/gtk/RenderThemeGtk.cpp:

(WebCore::paintGdkPixbuf):

Source/WebKit/gtk:

Fixed a memory leak in WebKitFaviconDatabase by adopting an
allocation of GdkPixbuf.

• webkit/webkitfavicondatabase.cpp:

(getIconPixbufSynchronously):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/gtk/RenderThemeGtk.cpp (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/webkit/webkitfavicondatabase.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-10  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
+
+        [GTK] Fix memory leaks by adopting allocation of GdkPixbuf
+        https://bugs.webkit.org/show_bug.cgi?id=90790
+
+        Reviewed by Carlos Garcia Campos.
+
+        Fixed a memory leak in paintGdkPixbuf by adopting an allocation
+        of GdkPixbuf.
+
+        No new tests. No change in behavior.
+
+        * platform/gtk/RenderThemeGtk.cpp:
+        (WebCore::paintGdkPixbuf):
+
 2012-07-10  Konrad Piascik  <kpiascik@rim.com>
 

trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp

@@ -239 +239 @@
 {
     IntSize iconSize(gdk_pixbuf_get_width(icon), gdk_pixbuf_get_height(icon));
+    GRefPtr<GdkPixbuf> scaledIcon;
     if (iconRect.size() != iconSize) {
         // We could use cairo_scale() here but cairo/pixman downscale quality is quite bad.
-        GRefPtr<GdkPixbuf> scaledIcon = gdk_pixbuf_scale_simple(icon, iconRect.width(), iconRect.height(),
-                                                                GDK_INTERP_BILINEAR);
+        scaledIcon = adoptGRef(gdk_pixbuf_scale_simple(icon, iconRect.width(), iconRect.height(),
+                                                       GDK_INTERP_BILINEAR));
         icon = scaledIcon.get();
     }

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2012-07-10  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
+
+        [GTK] Fix memory leaks by adopting allocation of GdkPixbuf
+        https://bugs.webkit.org/show_bug.cgi?id=90790
+
+        Reviewed by Carlos Garcia Campos.
+
+        Fixed a memory leak in WebKitFaviconDatabase by adopting an
+        allocation of GdkPixbuf.
+
+        * webkit/webkitfavicondatabase.cpp:
+        (getIconPixbufSynchronously):
+
 2012-07-10  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp

@@ -408 +408 @@
     int pixbufHeight = gdk_pixbuf_get_height(pixbuf.get());
     if (!iconSize.isZero() && (pixbufWidth != iconSize.width() || pixbufHeight != iconSize.height()))
-        pixbuf = gdk_pixbuf_scale_simple(pixbuf.get(), iconSize.width(), iconSize.height(), GDK_INTERP_BILINEAR);
+        pixbuf = adoptGRef(gdk_pixbuf_scale_simple(pixbuf.get(), iconSize.width(), iconSize.height(), GDK_INTERP_BILINEAR));
     return pixbuf.leakRef();
 }