Changeset 62652 in webkit

Timestamp:

Jul 7, 2010 4:39:21 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-07 Marc Mutz <​marc.mutz@kdab.com>

Reviewed by Adam Barth.

[Qt] QWebSettings: Don't leak native pixmaps

When Q_GLOBAL_STATIC gets around to deleting the QHash with the
pixmaps in, the QApplication destructor has already been
completed. This makes it impossible for ~QPixmap to return the
native pixmap to the OS, thus leaking them.

This patch adds a post routine (executed as part of ~QApplication)
that clears the hash so Q_GLOBAL_STATIC's destruction doesn't have
to execute ~QPixmap's anymore.

​https://bugs.webkit.org/show_bug.cgi?id=41657

• Api/qwebsettings.cpp: (earlyClearGraphics): New. Clears the pixmap hash. (graphics): add earlyClearGraphics as a qAddPostRoutine()

Location:

trunk/WebKit/qt

Files:

• Api/qwebsettings.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qwebsettings.cpp

@@ -81 +81 @@
 Q_GLOBAL_STATIC(WebGraphicHash, _graphics)
 
+static void earlyClearGraphics()
+{
+    _graphics()->clear();
+}
+
 static WebGraphicHash* graphics()
 {
@@ -86 +91 @@
 
     if (hash->isEmpty()) {
+
+        // prevent ~QPixmap running after ~QApplication (leaks native pixmaps)
+        qAddPostRoutine(earlyClearGraphics);
+
         hash->insert(QWebSettings::MissingImageGraphic, QPixmap(QLatin1String(":webkit/resources/missingImage.png")));
         hash->insert(QWebSettings::MissingPluginGraphic, QPixmap(QLatin1String(":webkit/resources/nullPlugin.png")));

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-07-07  Marc Mutz  <marc.mutz@kdab.com>
+
+        Reviewed by Adam Barth.
+
+        [Qt] QWebSettings: Don't leak native pixmaps
+
+        When Q_GLOBAL_STATIC gets around to deleting the QHash with the
+        pixmaps in, the QApplication destructor has already been
+        completed. This makes it impossible for ~QPixmap to return the
+        native pixmap to the OS, thus leaking them.
+
+        This patch adds a post routine (executed as part of ~QApplication)
+        that clears the hash so Q_GLOBAL_STATIC's destruction doesn't have
+        to execute ~QPixmap's anymore.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41657
+
+        * Api/qwebsettings.cpp:
+        (earlyClearGraphics): New. Clears the pixmap hash.
+        (graphics): add earlyClearGraphics as a qAddPostRoutine()
+
 2010-07-06  Csaba Osztrogonác  <ossy@webkit.org>