summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/runtime/JSArray.h
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-10-02 09:40:07 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-10-02 09:40:07 (GMT)
commitcfd31c28f2e30ee725d23c36ea8349f984b57047 (patch)
tree5fcf867475a6fde5b884c9236350460cee0ed95f /src/3rdparty/webkit/JavaScriptCore/runtime/JSArray.h
parent46c17756dfa231d5ce7a8907330d97807880a04c (diff)
parentfe85e470d76f6e53759d0fd508e858add5de1eb0 (diff)
downloadQt-cfd31c28f2e30ee725d23c36ea8349f984b57047.zip
Qt-cfd31c28f2e30ee725d23c36ea8349f984b57047.tar.gz
Qt-cfd31c28f2e30ee725d23c36ea8349f984b57047.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSArray.h')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/runtime/JSArray.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSArray.h b/src/3rdparty/webkit/JavaScriptCore/runtime/JSArray.h
index 4f2f86a..12768a4 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSArray.h
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSArray.h
@@ -41,9 +41,9 @@ namespace JSC {
friend class Walker;
public:
- explicit JSArray(PassRefPtr<Structure>);
- JSArray(PassRefPtr<Structure>, unsigned initialLength);
- JSArray(PassRefPtr<Structure>, const ArgList& initialValues);
+ explicit JSArray(NonNullPassRefPtr<Structure>);
+ JSArray(NonNullPassRefPtr<Structure>, unsigned initialLength);
+ JSArray(NonNullPassRefPtr<Structure>, const ArgList& initialValues);
virtual ~JSArray();
virtual bool getOwnPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot&);
@@ -116,11 +116,6 @@ namespace JSC {
JSArray* asArray(JSValue);
- JSArray* constructEmptyArray(ExecState*);
- JSArray* constructEmptyArray(ExecState*, unsigned initialLength);
- JSArray* constructArray(ExecState*, JSValue singleItemValue);
- JSArray* constructArray(ExecState*, const ArgList& values);
-
inline JSArray* asArray(JSCell* cell)
{
ASSERT(cell->inherits(&JSArray::info));