diff options
author | Keith Isdale <keith.isdale@nokia.com> | 2009-06-24 00:57:03 (GMT) |
---|---|---|
committer | Keith Isdale <keith.isdale@nokia.com> | 2009-06-24 00:57:03 (GMT) |
commit | 188919b3c6e94714de71e4d12d3713aabb52ab8d (patch) | |
tree | 8552f757a2fea1b3c303ffb7ee9e7e199da29f7f /src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.cpp | |
parent | 07d3055a7402ba58bc299e79b96808c8025e33de (diff) | |
parent | 7e9eaea489f9760b74e8930069222dd1200fb854 (diff) | |
download | Qt-188919b3c6e94714de71e4d12d3713aabb52ab8d.zip Qt-188919b3c6e94714de71e4d12d3713aabb52ab8d.tar.gz Qt-188919b3c6e94714de71e4d12d3713aabb52ab8d.tar.bz2 |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.cpp')
-rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.cpp index 0d41a16..fa1ebeb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.cpp @@ -69,9 +69,9 @@ static const HashTable JSHTMLOptionsCollectionPrototypeTable = const ClassInfo JSHTMLOptionsCollectionPrototype::s_info = { "HTMLOptionsCollectionPrototype", 0, &JSHTMLOptionsCollectionPrototypeTable, 0 }; -JSObject* JSHTMLOptionsCollectionPrototype::self(ExecState* exec) +JSObject* JSHTMLOptionsCollectionPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLOptionsCollection>(exec); + return getDOMPrototype<JSHTMLOptionsCollection>(exec, globalObject); } bool JSHTMLOptionsCollectionPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -86,9 +86,9 @@ JSHTMLOptionsCollection::JSHTMLOptionsCollection(PassRefPtr<Structure> structure { } -JSObject* JSHTMLOptionsCollection::createPrototype(ExecState* exec) +JSObject* JSHTMLOptionsCollection::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLOptionsCollectionPrototype(JSHTMLOptionsCollectionPrototype::createStructure(JSHTMLCollectionPrototype::self(exec))); + return new (exec) JSHTMLOptionsCollectionPrototype(JSHTMLOptionsCollectionPrototype::createStructure(JSHTMLCollectionPrototype::self(exec, globalObject))); } bool JSHTMLOptionsCollection::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) |