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/JSHTMLDocument.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/JSHTMLDocument.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.cpp index ceca27d..26d979c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.cpp @@ -91,7 +91,7 @@ public: JSHTMLDocumentConstructor(ExecState* exec) : DOMObject(JSHTMLDocumentConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLDocumentPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLDocumentPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -134,9 +134,9 @@ static const HashTable JSHTMLDocumentPrototypeTable = const ClassInfo JSHTMLDocumentPrototype::s_info = { "HTMLDocumentPrototype", 0, &JSHTMLDocumentPrototypeTable, 0 }; -JSObject* JSHTMLDocumentPrototype::self(ExecState* exec) +JSObject* JSHTMLDocumentPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLDocument>(exec); + return getDOMPrototype<JSHTMLDocument>(exec, globalObject); } bool JSHTMLDocumentPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -151,9 +151,9 @@ JSHTMLDocument::JSHTMLDocument(PassRefPtr<Structure> structure, PassRefPtr<HTMLD { } -JSObject* JSHTMLDocument::createPrototype(ExecState* exec) +JSObject* JSHTMLDocument::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLDocumentPrototype(JSHTMLDocumentPrototype::createStructure(JSDocumentPrototype::self(exec))); + return new (exec) JSHTMLDocumentPrototype(JSHTMLDocumentPrototype::createStructure(JSDocumentPrototype::self(exec, globalObject))); } bool JSHTMLDocument::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) |