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

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.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -208 +208 @@
     
 Interpreter::Interpreter(JSObject* globalObject)
-    : m_timeoutTime(0)
-    , m_globalExec(this, 0)
+    : m_globalExec(this, 0)
     , m_globalObject(globalObject)
-    , m_argumentsPropertyName(&argumentsPropertyName)
-    , m_specialPrototypePropertyName(&specialPrototypePropertyName)
-    , m_timeoutChecker(0)
-    , m_timedOut(false)
-    , m_startTimeoutCheckCount(0)
-    , m_pauseTimeoutCheckCount(0)
 {
     init();
@@ -222 +215 @@
 
 Interpreter::Interpreter()
-    : m_timeoutTime(0)
-    , m_globalExec(this, 0)
+    : m_globalExec(this, 0)
     , m_globalObject(new JSObject())
-    , m_argumentsPropertyName(&argumentsPropertyName)
-    , m_specialPrototypePropertyName(&specialPrototypePropertyName)
-    , m_timeoutChecker(0)
-    , m_timedOut(false)
-    , m_startTimeoutCheckCount(0)
-    , m_pauseTimeoutCheckCount(0)
 {
     init();
@@ -239 +225 @@
     JSLock lock;
 
+    m_refCount = 0;
+    m_timeoutTime = 0;
     m_recursion = 0;
     m_debugger= 0;
     m_context = 0;
+    m_timedOut = false;
+    m_timeoutChecker = 0;
+    m_startTimeoutCheckCount = 0;
+    m_pauseTimeoutCheckCount = 0;
     m_compatMode = NativeMode;
+    m_argumentsPropertyName = &argumentsPropertyName;
+    m_specialPrototypePropertyName = &specialPrototypePropertyName;
 
     interpreterMap().set(m_globalObject, this);