Merge WebKit at r84325: Initial merge by git.

[android-x86/external-webkit.git] / Source / JavaScriptGlue / UserObjectImp.h

diff --git a/Source/JavaScriptGlue/UserObjectImp.h b/Source/JavaScriptGlue/UserObjectImp.h
index c6b8d86..9bd6f0f 100644 (file)
--- a/Source/JavaScriptGlue/UserObjectImp.h
+++ b/Source/JavaScriptGlue/UserObjectImp.h
@@ -36,7 +36,7 @@
 
 class UserObjectImp : public JSNonFinalObject {
 public:
-    UserObjectImp(PassRefPtr<Structure>, JSUserObject*);
+    UserObjectImp(JSGlobalData&, Structure*, JSUserObject*);
     virtual ~UserObjectImp();
 
     static const ClassInfo s_info;
@@ -58,7 +58,7 @@ public:
 
     JSUserObject *GetJSUserObject() const;
 
-    static PassRefPtr<Structure> createStructure(JSGlobalData& globalData, JSValue prototype)
+    static Structure* createStructure(JSGlobalData& globalData, JSValue prototype)
     {
         return Structure::create(globalData, prototype, TypeInfo(ObjectType, OverridesGetOwnPropertySlot | OverridesMarkChildren | OverridesGetPropertyNames), AnonymousSlotCount, &s_info);
     }