JavaScriptCore-721.26.tar.gz

[apple/javascriptcore.git] / runtime / JSWrapperObject.h

diff --git a/runtime/JSWrapperObject.h b/runtime/JSWrapperObject.h
index 2a2e3c6ffdddabf0be3da80fb60f62b220c24455..f19cd30c85049409a338cce27f617e899ede340b 100644 (file)
--- a/runtime/JSWrapperObject.h
+++ b/runtime/JSWrapperObject.h
@@ -25,33 +25,43 @@
 #include "JSObject.h"
 
 namespace JSC {
 #include "JSObject.h"
 
 namespace JSC {

-    
+

     // This class is used as a base for classes such as String,
     // Number, Boolean and Date which are wrappers for primitive types.
     class JSWrapperObject : public JSObject {
     protected:
     // This class is used as a base for classes such as String,
     // Number, Boolean and Date which are wrappers for primitive types.
     class JSWrapperObject : public JSObject {
     protected:

-        explicit JSWrapperObject(PassRefPtr<Structure>);
+        explicit JSWrapperObject(NonNullPassRefPtr<Structure>);

 
     public:
         JSValue internalValue() const { return m_internalValue; }
         void setInternalValue(JSValue);
 
     public:
         JSValue internalValue() const { return m_internalValue; }
         void setInternalValue(JSValue);

-        
-        virtual void mark();
-        
+
+        static PassRefPtr<Structure> createStructure(JSValue prototype) 
+        { 
+            return Structure::create(prototype, TypeInfo(ObjectType, StructureFlags), AnonymousSlotCount);
+        }
+
+    protected:
+        static const unsigned AnonymousSlotCount = 1 + JSObject::AnonymousSlotCount;
+

     private:
     private:

+        virtual void markChildren(MarkStack&);
+        

         JSValue m_internalValue;
     };
         JSValue m_internalValue;
     };

-    
-    inline JSWrapperObject::JSWrapperObject(PassRefPtr<Structure> structure)
+
+    inline JSWrapperObject::JSWrapperObject(NonNullPassRefPtr<Structure> structure)

         : JSObject(structure)
     {
         : JSObject(structure)
     {

+        putAnonymousValue(0, jsNull());

     }
     }

-    
+

     inline void JSWrapperObject::setInternalValue(JSValue value)
     {
         ASSERT(value);
         ASSERT(!value.isObject());
         m_internalValue = value;
     inline void JSWrapperObject::setInternalValue(JSValue value)
     {
         ASSERT(value);
         ASSERT(!value.isObject());
         m_internalValue = value;

+        putAnonymousValue(0, value);

     }
 
 } // namespace JSC
     }
 
 } // namespace JSC