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/JSHTMLObjectElement.h | |
| 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/JSHTMLObjectElement.h')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.h index e2885ad..f23fe0b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.h @@ -32,7 +32,7 @@ class JSHTMLObjectElement : public JSHTMLElement { typedef JSHTMLElement Base; public: JSHTMLObjectElement(PassRefPtr<JSC::Structure>, PassRefPtr<HTMLObjectElement>); - static JSC::JSObject* createPrototype(JSC::ExecState*); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); bool customGetOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValuePtr, JSC::PutPropertySlot&); @@ -56,7 +56,7 @@ private: class JSHTMLObjectElementPrototype : public JSC::JSObject { public: - static JSC::JSObject* self(JSC::ExecState*); + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); |