1 files changed, 10 insertions, 11 deletions
diff --git a/WebCore/bridge/runtime_object.h b/WebCore/bridge/runtime_object.h
index 7e11273..b8788c9 100644
--- a/WebCore/bridge/runtime_object.h
+++ b/WebCore/bridge/runtime_object.h
@@ -33,12 +33,14 @@ namespace JSC {
 
 class RuntimeObjectImp : public JSObject {
 public:
+    RuntimeObjectImp(ExecState*, PassRefPtr<Bindings::Instance>);
+
     virtual ~RuntimeObjectImp();
 
     virtual bool getOwnPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot&);
-    virtual void put(ExecState*, const Identifier& propertyName, JSValue*, PutPropertySlot&);
+    virtual void put(ExecState*, const Identifier& propertyName, JSValuePtr, PutPropertySlot&);
     virtual bool deleteProperty(ExecState* , const Identifier& propertyName);
-    virtual JSValue* defaultValue(ExecState*, PreferredPrimitiveType) const;
+    virtual JSValuePtr defaultValue(ExecState*, PreferredPrimitiveType) const;
     virtual CallType getCallData(CallData&);
     virtual ConstructType getConstructData(ConstructData&);
     
@@ -56,23 +58,20 @@ public:
         return exec->lexicalGlobalObject()->objectPrototype();
     }
 
-    static PassRefPtr<StructureID> createStructureID(JSValue* prototype)
+    static PassRefPtr<Structure> createStructure(JSValuePtr prototype)
     {
-        return StructureID::create(prototype, TypeInfo(ObjectType));
+        return Structure::create(prototype, TypeInfo(ObjectType));
     }
 
 protected:
-    RuntimeObjectImp(ExecState*, PassRefPtr<StructureID>, PassRefPtr<Bindings::Instance>);
+    RuntimeObjectImp(ExecState*, PassRefPtr<Structure>, PassRefPtr<Bindings::Instance>);
 
 private:
-    friend class Bindings::Instance;
-    RuntimeObjectImp(ExecState*, PassRefPtr<Bindings::Instance>);
-
     virtual const ClassInfo* classInfo() const { return &s_info; }
     
-    static JSValue* fallbackObjectGetter(ExecState*, const Identifier&, const PropertySlot&);
-    static JSValue* fieldGetter(ExecState*, const Identifier&, const PropertySlot&);
-    static JSValue* methodGetter(ExecState*, const Identifier&, const PropertySlot&);
+    static JSValuePtr fallbackObjectGetter(ExecState*, const Identifier&, const PropertySlot&);
+    static JSValuePtr fieldGetter(ExecState*, const Identifier&, const PropertySlot&);
+    static JSValuePtr methodGetter(ExecState*, const Identifier&, const PropertySlot&);
 
     RefPtr<Bindings::Instance> instance;
 };