Changeset 28527 in webkit for trunk/JavaScriptCore/kjs/function.h

Timestamp:

Dec 7, 2007, 2:05:55 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

Reviewed by Sam Weinig.

Next step in refactoring JSGlobalObject: Added JSVariableObject class,
and factored symbol-table-related code into it. (JSGlobalObject doesn't
use the symbol table code yet, though.)

Layout and JS tests, and testapi, pass. SunSpider reports no regression.

WebCore:

Reviewed by Sam Weinig.

Added some namespace qualifications and a forwarding header, now that
KJS::Node is sometimes #included in WebCore by JavaScriptCore headers.

• ForwardingHeaders/wtf/ListRefPtr.h: Added.
• bindings/js/JSXSLTProcessor.cpp: (KJS::JSXSLTProcessorPrototypeFunctionTransformToFragment::callAsFunction):
• bindings/js/kjs_binding.cpp: (KJS::ScriptInterpreter::getDOMNodeForDocument): (KJS::ScriptInterpreter::forgetDOMNodeForDocument): (KJS::ScriptInterpreter::putDOMNodeForDocument): (KJS::ScriptInterpreter::markDOMNodesForDocument): (KJS::ScriptInterpreter::updateDOMNodeDocument):

WebKit/mac:

Reviewed by Sam Weinig.

Added a forwarding header, since we now #include nodes.h through some
JavaScriptCore headers.

• ForwardingHeaders/wtf/ListRefPtr.h: Added.

File:

• trunk/JavaScriptCore/kjs/function.h (modified) (4 diffs)

trunk/JavaScriptCore/kjs/function.h

@@ -26 +26 @@
 #define KJS_FUNCTION_H
 
+#include "JSVariableObject.h"
 #include "LocalStorage.h"
 #include "SymbolTable.h"
+#include "nodes.h"
 #include "object.h"
-#include <wtf/OwnPtr.h>
 
 namespace KJS {
@@ -138 +139 @@
   };
 
-  class ActivationImp : public JSObject {
-  private:
-    struct ActivationImpPrivate {
-        ActivationImpPrivate(ExecState* e)
-            : exec(e)
-            , function(e->function())
+  class ActivationImp : public JSVariableObject {
+  private:
+    using JSVariableObject::JSVariableObjectData;
+
+    struct ActivationImpData : public JSVariableObjectData {
+        ActivationImpData(ExecState* e)
+            : JSVariableObjectData(&e->function()->body->symbolTable())
+            , exec(e)
             , argumentsObject(0)
         {
         }
-        
-        LocalStorage localStorage;
+
         ExecState* exec;
-        FunctionImp* function;
         Arguments* argumentsObject;
     };
 
   public:
-    ActivationImp(ExecState*);
+    ActivationImp::ActivationImp(ExecState* exec)
+        : JSVariableObject(new ActivationImpData(exec))
+    {
+    }
+
+    virtual ~ActivationImp()
+    {
+        delete d();
+    }
 
     virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
     virtual void put(ExecState*, const Identifier& propertyName, JSValue* value, int attr = None);
     virtual bool deleteProperty(ExecState*, const Identifier& propertyName);
-    virtual void getPropertyNames(ExecState*, PropertyNameArray&);
 
     virtual const ClassInfo* classInfo() const { return &info; }
@@ -167 +175 @@
     virtual void mark();
 
-    bool isActivation() { return true; }
-
-    LocalStorage& localStorage() { return d->localStorage; }
-    SymbolTable& symbolTable() { return *m_symbolTable; }
+    virtual bool isActivationObject() { return true; }
 
   private:
@@ -176 +181 @@
     static JSValue* argumentsGetter(ExecState*, JSObject*, const Identifier&, const PropertySlot& slot);
     void createArgumentsObject(ExecState*);
-    
-    OwnPtr<ActivationImpPrivate> d;
-    SymbolTable* m_symbolTable;
+    ActivationImpData* d() { return static_cast<ActivationImpData*>(JSVariableObject::d); }
   };