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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 8dfbf88679eb174c881a6da7408a8510fd9bacb8
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 9 00:11:33 2002 +0000

    	* Misc.subproj/IFCache.h: Add more JavaScript object statistics.
    	* Misc.subproj/IFCache.mm:
    	(+[IFCache javaScriptInterpretersCount]): New.
    	(+[IFCache javaScriptNoGCAllowedObjectsCount]): New.
    	(+[IFCache javaScriptReferencedObjectsCount]): New.
    
    	* WebKit.pbproj/project.pbxproj: Rearranged two files, dunno why.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1113 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index bd3769b..1d67a35 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-05-08  Darin Adler  <darin at apple.com>
+
+	* Misc.subproj/IFCache.h: Add more JavaScript object statistics.
+	* Misc.subproj/IFCache.mm:
+	(+[IFCache javaScriptInterpretersCount]): New.
+	(+[IFCache javaScriptNoGCAllowedObjectsCount]): New.
+	(+[IFCache javaScriptReferencedObjectsCount]): New.
+
+	* WebKit.pbproj/project.pbxproj: Rearranged two files, dunno why.
+
 2002-05-08  Chris Blumenberg  <cblu at apple.com>
 
 	Cleaned up mach-o plug-in support.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index bd3769b..1d67a35 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-05-08  Darin Adler  <darin at apple.com>
+
+	* Misc.subproj/IFCache.h: Add more JavaScript object statistics.
+	* Misc.subproj/IFCache.mm:
+	(+[IFCache javaScriptInterpretersCount]): New.
+	(+[IFCache javaScriptNoGCAllowedObjectsCount]): New.
+	(+[IFCache javaScriptReferencedObjectsCount]): New.
+
+	* WebKit.pbproj/project.pbxproj: Rearranged two files, dunno why.
+
 2002-05-08  Chris Blumenberg  <cblu at apple.com>
 
 	Cleaned up mach-o plug-in support.
diff --git a/WebKit/Misc.subproj/IFCache.h b/WebKit/Misc.subproj/IFCache.h
index 466c88d..6aa89ff 100644
--- a/WebKit/Misc.subproj/IFCache.h
+++ b/WebKit/Misc.subproj/IFCache.h
@@ -17,5 +17,9 @@
 + (void)setDisabled:(BOOL)disabled;
 
 + (int)javaScriptObjectsCount;
++ (int)javaScriptInterpretersCount;
++ (int)javaScriptNoGCAllowedObjectsCount;
++ (int)javaScriptReferencedObjectsCount;
 + (void)garbageCollectJavaScriptObjects;
+
 @end
diff --git a/WebKit/Misc.subproj/IFCache.mm b/WebKit/Misc.subproj/IFCache.mm
index 45b3e12..5a10067 100644
--- a/WebKit/Misc.subproj/IFCache.mm
+++ b/WebKit/Misc.subproj/IFCache.mm
@@ -53,6 +53,21 @@
     return KJS::Collector::size();
 }
 
++ (int)javaScriptInterpretersCount
+{
+    return KJS::Collector::numInterpreters();
+}
+
++ (int)javaScriptNoGCAllowedObjectsCount
+{
+    return KJS::Collector::numGCNotAllowedObjects();
+}
+
++ (int)javaScriptReferencedObjectsCount
+{
+    return KJS::Collector::numReferencedObjects();
+}
+
 + (void)garbageCollectJavaScriptObjects
 {
     while (KJS::Collector::collect()) { }
diff --git a/WebKit/Misc.subproj/WebCoreStatistics.h b/WebKit/Misc.subproj/WebCoreStatistics.h
index 466c88d..6aa89ff 100644
--- a/WebKit/Misc.subproj/WebCoreStatistics.h
+++ b/WebKit/Misc.subproj/WebCoreStatistics.h
@@ -17,5 +17,9 @@
 + (void)setDisabled:(BOOL)disabled;
 
 + (int)javaScriptObjectsCount;
++ (int)javaScriptInterpretersCount;
++ (int)javaScriptNoGCAllowedObjectsCount;
++ (int)javaScriptReferencedObjectsCount;
 + (void)garbageCollectJavaScriptObjects;
+
 @end
diff --git a/WebKit/Misc.subproj/WebCoreStatistics.m b/WebKit/Misc.subproj/WebCoreStatistics.m
index 45b3e12..5a10067 100644
--- a/WebKit/Misc.subproj/WebCoreStatistics.m
+++ b/WebKit/Misc.subproj/WebCoreStatistics.m
@@ -53,6 +53,21 @@
     return KJS::Collector::size();
 }
 
++ (int)javaScriptInterpretersCount
+{
+    return KJS::Collector::numInterpreters();
+}
+
++ (int)javaScriptNoGCAllowedObjectsCount
+{
+    return KJS::Collector::numGCNotAllowedObjects();
+}
+
++ (int)javaScriptReferencedObjectsCount
+{
+    return KJS::Collector::numReferencedObjects();
+}
+
 + (void)garbageCollectJavaScriptObjects
 {
     while (KJS::Collector::collect()) { }
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 20b6ea7..3b7a381 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -371,8 +371,8 @@
 				F5C283730284676D018635CA,
 				25A5593101A5996D0ECA149E,
 				25A5593201A5996D0ECA149E,
-				F59EAE410253C8DE018635CA,
 				F59EAE3E0253C7EE018635CA,
+				F59EAE410253C8DE018635CA,
 			);
 			isa = PBXGroup;
 			name = "Other Sources";

-- 
WebKit Debian packaging