Changeset 15437 in webkit for trunk/JavaScriptCore/kjs/interpreter.h

Timestamp:

Jul 14, 2006, 3:39:58 PM (19 years ago)

Author:

ggaren

Message:

JavaScriptCore:

Reviewed by Maciej.

• Implemented ref-counting of JSContexts by splitting into two datatypes: JSGlobalContext, which you can create/retain/release, and JSContext, which you can't.

Internally, you retain a JSGlobalContext/ExecState by retaining its
interpreter, which, in the case of a global ExecState, owns it.

• Also made ~Interpreter() protected to catch places where Interpreter is manually deleted. (Can't make it private because some crazy fool decided it would be a good idea to subclass Interpreter in other frameworks. I pity da fool.)

• API/APICast.h: (toJS): Added cast for new JSGlobalContext
• API/JSStringRef.h: Changed vague "you must" language to more specific (but, ultimately, equally vague) "behavior is undefined if you don't" language. (KJS::Interpreter::Interpreter): Factored more common initialization into init()
• kjs/interpreter.h: (KJS::Interpreter::ref): new (KJS::Interpreter::deref): new (KJS::Interpreter::refCount): new
• kjs/testkjs.cpp: (doIt): Ref-count the interpreter.

JavaScriptGlue:

Reviewed by Maciej.

• Updated JSInterpreter to work with Interpreter ref-counting in JavaScriptCore.

(JSInterpreter::JSInterpreter::~JSInterpreter): Now protected to catch
manual delete.

WebCore:

Reviewed by Maciej.

• Updated ScriptInterpreter to work with Interpreter ref-counting in JavaScriptCore.

(KJS::ScriptInterpreter::~ScriptInterpreter): Now protected to catch
manual delete.

File:

• trunk/JavaScriptCore/kjs/interpreter.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/interpreter.h

@@ -75 +75 @@
      */
     Interpreter();
-    virtual ~Interpreter();
 
     /**
@@ -338 +337 @@
     bool checkTimeout();
     
+    void ref() { ++m_refCount; }
+    void deref() { if (--m_refCount <= 0) delete this; }
+    int refCount() const { return m_refCount; }
+    
 protected:
+    virtual ~Interpreter(); // only deref should delete us
     virtual bool shouldInterruptScript() const { return true; }
+
     long m_timeoutTime;
 
@@ -359 +364 @@
      */
     Interpreter operator=(const Interpreter&);
+    
+    int m_refCount;
     
     ExecState m_globalExec;