[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 17bfccd7b806ef38bc39ebe893fe4c13c9eb9a00
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Apr 1 20:40:33 2002 +0000

    WebKit:
    
            Added operations for JavaScript objects. Not sure if this was the best
            place for them, but it should be OK for now.
    
            * Misc.subproj/IFCache.h:
            * Misc.subproj/IFCache.mm: (+[IFCache setDisabled:]), (+[IFCache
            javaScriptObjectsCount]), (+[IFCache garbageCollectJavaScriptObjects]):
            * WebKit.pbproj/project.pbxproj:
    
    WebBrowser:
    
            Rearranged caches window, renamed it, and added stuff about
            JavaScript objects.
    
            * Debug/CacheController.h:
            * Debug/CacheController.mm: (-[CacheController windowDidLoad]),
            (-[CacheController emptyWebCoreCaches:]), (-[CacheController
            setStat:toKey:fromDict:]), (-[CacheController setTotal:fromDict:]),
            (-[CacheController refreshWebCoreStatisticsMatrix]), (-[CacheController
            refreshStatistics:]), (-[CacheController toggleDisableWebCoreCaches:]),
            (-[CacheController garbageCollectJavaScriptObjects:]):
            * Debug/CacheController.nib:
            * Debug/DebugUtilities.m: (+[DebugUtilities createDebugMenu]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@920 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 708996b..59e0f5c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-04-01  Darin Adler  <darin at apple.com>
+
+	Added operations for JavaScript objects. Not sure if this was the best
+	place for them, but it should be OK for now.
+
+	* Misc.subproj/IFCache.h:
+	* Misc.subproj/IFCache.mm: (+[IFCache setDisabled:]), (+[IFCache
+	javaScriptObjectsCount]), (+[IFCache garbageCollectJavaScriptObjects]):
+	* WebKit.pbproj/project.pbxproj:
+
 2002-03-30  Richard Williamson  <rjw at apple.com>
 
         Corrected comments describing the new 'acceptable to layout' state
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 708996b..59e0f5c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-04-01  Darin Adler  <darin at apple.com>
+
+	Added operations for JavaScript objects. Not sure if this was the best
+	place for them, but it should be OK for now.
+
+	* Misc.subproj/IFCache.h:
+	* Misc.subproj/IFCache.mm: (+[IFCache setDisabled:]), (+[IFCache
+	javaScriptObjectsCount]), (+[IFCache garbageCollectJavaScriptObjects]):
+	* WebKit.pbproj/project.pbxproj:
+
 2002-03-30  Richard Williamson  <rjw at apple.com>
 
         Corrected comments describing the new 'acceptable to layout' state
diff --git a/WebKit/Misc.subproj/IFCache.h b/WebKit/Misc.subproj/IFCache.h
index 1f2c2dd..466c88d 100644
--- a/WebKit/Misc.subproj/IFCache.h
+++ b/WebKit/Misc.subproj/IFCache.h
@@ -11,7 +11,11 @@
 @interface IFCache : NSObject
 {
 }
+
 + (NSArray *)getStatistics;
 + (void)empty;
 + (void)setDisabled:(BOOL)disabled;
+
++ (int)javaScriptObjectsCount;
++ (void)garbageCollectJavaScriptObjects;
 @end
diff --git a/WebKit/Misc.subproj/IFCache.mm b/WebKit/Misc.subproj/IFCache.mm
index d8c6aef..3475478 100644
--- a/WebKit/Misc.subproj/IFCache.mm
+++ b/WebKit/Misc.subproj/IFCache.mm
@@ -9,6 +9,7 @@
 #import "IFCache.h"
 
 #include "misc/loader.h"
+#include "kjs/collector.h"
 
 @implementation IFCache
 
@@ -47,4 +48,14 @@
     khtml::Cache::setCacheDisabled(disabled);
 }
 
++ (int)javaScriptObjectsCount
+{
+    return KJS::Collector::size();
+}
+
++ (void)garbageCollectJavaScriptObjects
+{
+    while (KJS::Collector::collect()) { }
+}
+
 @end
diff --git a/WebKit/Misc.subproj/WebCoreStatistics.h b/WebKit/Misc.subproj/WebCoreStatistics.h
index 1f2c2dd..466c88d 100644
--- a/WebKit/Misc.subproj/WebCoreStatistics.h
+++ b/WebKit/Misc.subproj/WebCoreStatistics.h
@@ -11,7 +11,11 @@
 @interface IFCache : NSObject
 {
 }
+
 + (NSArray *)getStatistics;
 + (void)empty;
 + (void)setDisabled:(BOOL)disabled;
+
++ (int)javaScriptObjectsCount;
++ (void)garbageCollectJavaScriptObjects;
 @end
diff --git a/WebKit/Misc.subproj/WebCoreStatistics.m b/WebKit/Misc.subproj/WebCoreStatistics.m
index d8c6aef..3475478 100644
--- a/WebKit/Misc.subproj/WebCoreStatistics.m
+++ b/WebKit/Misc.subproj/WebCoreStatistics.m
@@ -9,6 +9,7 @@
 #import "IFCache.h"
 
 #include "misc/loader.h"
+#include "kjs/collector.h"
 
 @implementation IFCache
 
@@ -47,4 +48,14 @@
     khtml::Cache::setCacheDisabled(disabled);
 }
 
++ (int)javaScriptObjectsCount
+{
+    return KJS::Collector::size();
+}
+
++ (void)garbageCollectJavaScriptObjects
+{
+    while (KJS::Collector::collect()) { }
+}
+
 @end
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index f84fb9b..bcc28a6 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -127,7 +127,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
-				HEADER_SEARCH_PATHS = ../WebCore/include;
+				HEADER_SEARCH_PATHS = "../WebCore/include ../JavaScriptCore";
 				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_CFLAGS = "-Werror -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -DHAVE_CONFIG_H -DQT_NO_DATASTREAM -D_KWQ_  -I.. -I../WebCore/src/kdelibs/khtml -I../WebCore/src/kwq -I../WebCore/src/kwq/kparts -I../WebCore/include -I../WebCore/include/private -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ -F/System/Library/Frameworks/CoreServices.framework/Frameworks/ -F/System/Library/Frameworks/Carbon.framework/Frameworks/";

-- 
WebKit Debian packaging