Reviewed by Darin.

Add collector helper to interpreter in order to facilitate visibility rules in
KDE.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@12031 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 52fb199aeab13350f438ec141026905738695623..4e35ac2d85627c0c320fb27e46fa4ec28474ea91 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2006-01-12  George Staikos <staikos@kde.org>
+
+        Reviewed by Darin.
+
+        * kjs/interpreter.cpp:
+        * kjs/testkjs.cpp:
+        * kjs/interpreter.h:
+        Add helper to interpreter to call the collector in order to facilitate
+        visibility rules in KDE.
+
 2006-01-12  George Staikos <staikos@kde.org>
 
         Reviewed by Maciej.

diff --git a/JavaScriptCore/kjs/interpreter.cpp b/JavaScriptCore/kjs/interpreter.cpp
index a2de5dc1e8d2435cbf717e103b6ae5eefeca6b06..a0b0773dbd9ddabb59a275ad373020db2e147a29 100644 (file)
--- a/JavaScriptCore/kjs/interpreter.cpp
+++ b/JavaScriptCore/kjs/interpreter.cpp
@@ -291,6 +291,11 @@ Interpreter::CompatMode Interpreter::compatMode() const
   return rep->compatMode();
 }
 
+bool Interpreter::collect()
+{
+  return Collector::collect();
+}
+
 #ifdef KJS_DEBUG_MEM
 #include "lexer.h"
 void Interpreter::finalCheck()

diff --git a/JavaScriptCore/kjs/interpreter.h b/JavaScriptCore/kjs/interpreter.h
index cc475329f1b5419046ffa30efa5601b60f1bbb01..d963970416188b6ca7832829b1023daaf3c86907 100644 (file)
--- a/JavaScriptCore/kjs/interpreter.h
+++ b/JavaScriptCore/kjs/interpreter.h
@@ -336,6 +336,12 @@ namespace KJS {
     void setCompatMode(CompatMode mode);
     CompatMode compatMode() const;
 
+    /**
+     * Run the garbage collection. Returns true when at least one object
+     * was collected; false otherwise.
+     */
+    static bool collect();
+
     /**
      * Called by InterpreterImp during the mark phase of the garbage collector
      * Default implementation does nothing, this exist for classes that reimplement Interpreter.

diff --git a/JavaScriptCore/kjs/testkjs.cpp b/JavaScriptCore/kjs/testkjs.cpp
index 11d8a5c18987101312e1d5d4e2257e738cf1f16a..9ac45d8862cb78d49e30a07f13ffed7abf7f3102 100644 (file)
--- a/JavaScriptCore/kjs/testkjs.cpp
+++ b/JavaScriptCore/kjs/testkjs.cpp
@@ -31,7 +31,6 @@
 #include "object.h"
 #include "types.h"
 #include "interpreter.h"
-#include "collector.h"
 #include "JSLock.h"
 
 using namespace KJS;
@@ -67,7 +66,7 @@ JSValue *TestFunctionImp::callAsFunction(ExecState *exec, JSObject */*thisObj*/,
   case GC:
   {
     JSLock lock;
-    Collector::collect();
+    Interpreter::collect();
   }
     break;
   default: