[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

mjs mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:00:03 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 11fa23cb425c410ecfd223ff7cd021070358c97a
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 2 07:16:26 2002 +0000

    	* src/kwq/KWQKHTMLPart.mm (KHTMLPartPrivate::~KHTMLPartPrivate):
    	Delete the jScript interpreter if it exists, to avoid leaking
    	it. Also, garbage collect in this case because when we destroy the
    	interpreter a lot of objects will become garbage and this seems
    	like a good time to clean it all up.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@930 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index f3a3443..70b5add 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-04-01  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/KWQKHTMLPart.mm (KHTMLPartPrivate::~KHTMLPartPrivate):
+	Delete the jScript interpreter if it exists, to avoid leaking
+	it. Also, garbage collect in this case because when we destroy the
+	interpreter a lot of objects will become garbage and this seems
+	like a good time to clean it all up.
+
 2002-04-01  Richard Williamson  <rjw at apple.com>
 
         Added log to catch more problems with NS/CFURL.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f3a3443..70b5add 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-04-01  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/KWQKHTMLPart.mm (KHTMLPartPrivate::~KHTMLPartPrivate):
+	Delete the jScript interpreter if it exists, to avoid leaking
+	it. Also, garbage collect in this case because when we destroy the
+	interpreter a lot of objects will become garbage and this seems
+	like a good time to clean it all up.
+
 2002-04-01  Richard Williamson  <rjw at apple.com>
 
         Added log to catch more problems with NS/CFURL.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f3a3443..70b5add 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-04-01  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/KWQKHTMLPart.mm (KHTMLPartPrivate::~KHTMLPartPrivate):
+	Delete the jScript interpreter if it exists, to avoid leaking
+	it. Also, garbage collect in this case because when we destroy the
+	interpreter a lot of objects will become garbage and this seems
+	like a good time to clean it all up.
+
 2002-04-01  Richard Williamson  <rjw at apple.com>
 
         Added log to catch more problems with NS/CFURL.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 2eb0223..2c7f46a 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -72,6 +72,7 @@
 #include <rendering/render_image.h>
 #include <loader.h>
 #include <kjs/interpreter.h>
+#include <kjs/collector.h>
 #include <kjs_dom.h>
 #include <dom_doc.h>
 #include <qcursor.h>
@@ -208,6 +209,10 @@ public:
         delete m_settings;
         if (m_decoder)
             delete m_decoder;
+	if (m_jscript != 0) {
+	    delete m_jscript;
+	    KJS::Collector::collect();
+	}
     }
 
 };
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 2eb0223..2c7f46a 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -72,6 +72,7 @@
 #include <rendering/render_image.h>
 #include <loader.h>
 #include <kjs/interpreter.h>
+#include <kjs/collector.h>
 #include <kjs_dom.h>
 #include <dom_doc.h>
 #include <qcursor.h>
@@ -208,6 +209,10 @@ public:
         delete m_settings;
         if (m_decoder)
             delete m_decoder;
+	if (m_jscript != 0) {
+	    delete m_jscript;
+	    KJS::Collector::collect();
+	}
     }
 
 };
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 2eb0223..2c7f46a 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -72,6 +72,7 @@
 #include <rendering/render_image.h>
 #include <loader.h>
 #include <kjs/interpreter.h>
+#include <kjs/collector.h>
 #include <kjs_dom.h>
 #include <dom_doc.h>
 #include <qcursor.h>
@@ -208,6 +209,10 @@ public:
         delete m_settings;
         if (m_decoder)
             delete m_decoder;
+	if (m_jscript != 0) {
+	    delete m_jscript;
+	    KJS::Collector::collect();
+	}
     }
 
 };

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list