summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.cpp
diff options
context:
space:
mode:
authorGareth Stockwell <gareth.stockwell@sosco.com>2009-09-29 16:09:17 (GMT)
committerGareth Stockwell <gareth.stockwell@sosco.com>2009-09-29 16:09:17 (GMT)
commit1cbe6b2126a10ad846167d147b4cfbf3c6d9b402 (patch)
tree84b9ac33707f194cb34c753f91f9c948e2593510 /src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.cpp
parentd34bbd852241fcd9ddf50c961b5e234f9de0b5ac (diff)
parent17c17adbd706d32723ecedeb207c7e467f9fa8eb (diff)
downloadQt-1cbe6b2126a10ad846167d147b4cfbf3c6d9b402.zip
Qt-1cbe6b2126a10ad846167d147b4cfbf3c6d9b402.tar.gz
Qt-1cbe6b2126a10ad846167d147b4cfbf3c6d9b402.tar.bz2
Merge branch 'mmfphonon' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mmfphonon
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.cpp')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.cpp5
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;