Changeset 41151 in webkit

Timestamp:

Feb 23, 2009 11:52:52 AM (15 years ago)

Author:

treat@webkit.org

Message:

2009-02-23 Adam Treat <​adam.treat@torchmobile.com>

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=24094
Make sure to empty the cache on exit to get rid of superfluous leak messages
for CachedResource's in order to keep the leak messages accurate. This
is analagous to what the Mac port is doing on application exit when all
WebView's have been closed.

• Api/qwebpage.cpp: (QWebPagePrivate::_q_cleanupLeakMessages): (QWebPage::QWebPage):
• Api/qwebpage.h:
• Api/qwebpage_p.h:

Location:

trunk/WebKit/qt

Files:

• Api/qwebpage.cpp (modified) (3 diffs)
• Api/qwebpage.h (modified) (1 diff)
• Api/qwebpage_p.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -65 +65 @@
 #include "WindowFeatures.h"
 #include "LocalizedStrings.h"
+#include "Cache.h"
 #include "runtime/InitializeThreading.h"
 
@@ -430 +431 @@
 }
 
+#ifndef NDEBUG
+void QWebPagePrivate::_q_cleanupLeakMessages()
+{
+    // Need this to make leak messages accurate.
+    cache()->setCapacities(0, 0, 0);
+}
+#endif
+
 void QWebPagePrivate::updateAction(QWebPage::WebAction action)
 {
@@ -1252 +1261 @@
 
     connect(this, SIGNAL(loadProgress(int)), this, SLOT(_q_onLoadProgressChanged(int)));
+#ifndef NDEBUG
+    connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(_q_cleanupLeakMessages()));
+#endif
 }
 

trunk/WebKit/qt/Api/qwebpage.h

@@ -326 +326 @@
     Q_PRIVATE_SLOT(d, void _q_onLoadProgressChanged(int))
     Q_PRIVATE_SLOT(d, void _q_webActionTriggered(bool checked))
+#ifndef NDEBUG
+    Q_PRIVATE_SLOT(d, void _q_cleanupLeakMessages())
+#endif
     QWebPagePrivate *d;
 

trunk/WebKit/qt/Api/qwebpage_p.h

@@ -80 +80 @@
     void _q_onLoadProgressChanged(int);
     void _q_webActionTriggered(bool checked);
+#ifndef NDEBUG
+    void _q_cleanupLeakMessages();
+#endif
     void updateAction(QWebPage::WebAction action);
     void updateNavigationActions();

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-02-23  Adam Treat  <adam.treat@torchmobile.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=24094
+        Make sure to empty the cache on exit to get rid of superfluous leak messages
+        for CachedResource's in order to keep the leak messages accurate.  This
+        is analagous to what the Mac port is doing on application exit when all
+        WebView's have been closed.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::_q_cleanupLeakMessages):
+        (QWebPage::QWebPage):
+        * Api/qwebpage.h:
+        * Api/qwebpage_p.h:
+
 2009-02-23  Thiago Macieira  <thiago.macieira@nokia.com>