diff options
author | Bea Lam <bea.lam@nokia.com> | 2009-10-04 23:09:36 (GMT) |
---|---|---|
committer | Bea Lam <bea.lam@nokia.com> | 2009-10-04 23:09:36 (GMT) |
commit | 8e3bc733da076e321bd9a03d74aa79eb32d8d1e8 (patch) | |
tree | b725ef8ad82e79526e3156aeed4818166b4fd644 /src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.cpp | |
parent | 26902aaa6aec89f873cc5e4b13d953f5c83049cc (diff) | |
parent | c76bb1dcda7b0339d9de427d155b593b3779bea7 (diff) | |
download | Qt-8e3bc733da076e321bd9a03d74aa79eb32d8d1e8.zip Qt-8e3bc733da076e321bd9a03d74aa79eb32d8d1e8.tar.gz Qt-8e3bc733da076e321bd9a03d74aa79eb32d8d1e8.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.cpp')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.cpp index 74af4b1..db2a9b2 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.cpp @@ -513,11 +513,6 @@ void JSObject::allocatePropertyStorage(size_t oldSize, size_t newSize) allocatePropertyStorageInline(oldSize, newSize); } -JSObject* constructEmptyObject(ExecState* exec) -{ - return new (exec) JSObject(exec->lexicalGlobalObject()->emptyObjectStructure()); -} - bool JSObject::getOwnPropertyDescriptor(ExecState*, const Identifier& propertyName, PropertyDescriptor& descriptor) { unsigned attributes = 0; |