diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-31 11:52:57 +1000 |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-31 11:52:57 +1000 |
commit | aa9cf406d62004519ad54596e1c391f9a6439210 (patch) | |
tree | dd562b9c296981f2761b76623911be8496c7af84 /src/3rdparty/webkit/WebCore/generated/JSEntityReference.cpp | |
parent | 987aec28b950e1c9817a20a9dd71afc071cd93ea (diff) | |
parent | 56b6a5924008ab5cdbae36e9662eddba923acd5e (diff) |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/webkit/WebCore/generated/JSEntityReference.cpp')
-rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSEntityReference.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSEntityReference.cpp b/src/3rdparty/webkit/WebCore/generated/JSEntityReference.cpp index 1d6b6ff23..5e18f0733 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEntityReference.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSEntityReference.cpp @@ -59,12 +59,12 @@ static JSC_CONST_HASHTABLE HashTable JSEntityReferenceConstructorTable = { 1, 0, JSEntityReferenceConstructorTableValues, 0 }; #endif -class JSEntityReferenceConstructor : public DOMObject { +class JSEntityReferenceConstructor : public DOMConstructorObject { public: - JSEntityReferenceConstructor(ExecState* exec) - : DOMObject(JSEntityReferenceConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSEntityReferenceConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSEntityReferenceConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSEntityReferencePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSEntityReferencePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -106,8 +106,8 @@ JSObject* JSEntityReferencePrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSEntityReference::s_info = { "EntityReference", &JSNode::s_info, &JSEntityReferenceTable, 0 }; -JSEntityReference::JSEntityReference(PassRefPtr<Structure> structure, PassRefPtr<EntityReference> impl) - : JSNode(structure, impl) +JSEntityReference::JSEntityReference(PassRefPtr<Structure> structure, JSDOMGlobalObject* globalObject, PassRefPtr<EntityReference> impl) + : JSNode(structure, globalObject, impl) { } @@ -123,11 +123,12 @@ bool JSEntityReference::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsEntityReferenceConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast<JSEntityReference*>(asObject(slot.slotBase()))->getConstructor(exec); + JSEntityReference* domObject = static_cast<JSEntityReference*>(asObject(slot.slotBase())); + return JSEntityReference::getConstructor(exec, domObject->globalObject()); } -JSValue JSEntityReference::getConstructor(ExecState* exec) +JSValue JSEntityReference::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor<JSEntityReferenceConstructor>(exec); + return getDOMConstructor<JSEntityReferenceConstructor>(exec, static_cast<JSDOMGlobalObject*>(globalObject)); } |