diff options
| author | axis <qt-info@nokia.com> | 2009-06-29 12:25:09 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-06-29 12:25:09 (GMT) |
| commit | 1a8c89e9eaec05e9f38eae4fbc007d8344015de3 (patch) | |
| tree | d87e517cfab9443926841b3ef92ca715a717f54a /src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.cpp | |
| parent | 78166d5235a5045fdc887febe01d789cac333bb3 (diff) | |
| parent | b6171cfbe3b1453a2c46f78db0df4819e4e5e54f (diff) | |
| download | Qt-1a8c89e9eaec05e9f38eae4fbc007d8344015de3.zip Qt-1a8c89e9eaec05e9f38eae4fbc007d8344015de3.tar.gz Qt-1a8c89e9eaec05e9f38eae4fbc007d8344015de3.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
.gitignore
src/gui/dialogs/qfiledialog_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
tests/auto/network-settings.h
tests/auto/qitemdelegate/tst_qitemdelegate.cpp
Diffstat (limited to 'src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.cpp index 3bb2572..23c9a34 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.cpp @@ -87,7 +87,7 @@ public: JSHTMLTextAreaElementConstructor(ExecState* exec) : DOMObject(JSHTMLTextAreaElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) { - putDirect(exec->propertyNames().prototype, JSHTMLTextAreaElementPrototype::self(exec), None); + putDirect(exec->propertyNames().prototype, JSHTMLTextAreaElementPrototype::self(exec, exec->lexicalGlobalObject()), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -124,9 +124,9 @@ static const HashTable JSHTMLTextAreaElementPrototypeTable = const ClassInfo JSHTMLTextAreaElementPrototype::s_info = { "HTMLTextAreaElementPrototype", 0, &JSHTMLTextAreaElementPrototypeTable, 0 }; -JSObject* JSHTMLTextAreaElementPrototype::self(ExecState* exec) +JSObject* JSHTMLTextAreaElementPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSHTMLTextAreaElement>(exec); + return getDOMPrototype<JSHTMLTextAreaElement>(exec, globalObject); } bool JSHTMLTextAreaElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -141,9 +141,9 @@ JSHTMLTextAreaElement::JSHTMLTextAreaElement(PassRefPtr<Structure> structure, Pa { } -JSObject* JSHTMLTextAreaElement::createPrototype(ExecState* exec) +JSObject* JSHTMLTextAreaElement::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSHTMLTextAreaElementPrototype(JSHTMLTextAreaElementPrototype::createStructure(JSHTMLElementPrototype::self(exec))); + return new (exec) JSHTMLTextAreaElementPrototype(JSHTMLTextAreaElementPrototype::createStructure(JSHTMLElementPrototype::self(exec, globalObject))); } bool JSHTMLTextAreaElement::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) |