Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 8 insertions, 3 deletions

diff --git a/Source/WebCore/bridge/runtime_array.h b/Source/WebCore/bridge/runtime_array.h
index f7b67bf..f4c74e2 100644
--- a/Source/WebCore/bridge/runtime_array.h
+++ b/Source/WebCore/bridge/runtime_array.h
@@ -46,8 +46,6 @@ public:
     virtual bool deleteProperty(ExecState* exec, const Identifier &propertyName);
     virtual bool deleteProperty(ExecState* exec, unsigned propertyName);
     
-    virtual const ClassInfo* classInfo() const { return &s_info; }
-    
     unsigned getLength() const { return getConcreteArray()->getLength(); }
     
     Bindings::Array* getConcreteArray() const { return static_cast<Bindings::Array*>(subclassData()); }
@@ -59,8 +57,15 @@ public:
         return globalObject->arrayPrototype();
     }
 
+    static PassRefPtr<Structure> createStructure(JSValue prototype)
+    {
+        return Structure::create(prototype, TypeInfo(ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
+    }
+
+protected:
+    static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesGetPropertyNames | JSArray::StructureFlags;
+
 private:
-    static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesGetPropertyNames | JSObject::StructureFlags;
     static JSValue lengthGetter(ExecState*, JSValue, const Identifier&);
     static JSValue indexGetter(ExecState*, JSValue, unsigned);
 };