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/JSImageData.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/JSImageData.cpp')
-rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSImageData.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSImageData.cpp b/src/3rdparty/webkit/WebCore/generated/JSImageData.cpp index 139249b9b..841b1a2e6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSImageData.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSImageData.cpp @@ -62,12 +62,12 @@ static JSC_CONST_HASHTABLE HashTable JSImageDataConstructorTable = { 1, 0, JSImageDataConstructorTableValues, 0 }; #endif -class JSImageDataConstructor : public DOMObject { +class JSImageDataConstructor : public DOMConstructorObject { public: - JSImageDataConstructor(ExecState* exec) - : DOMObject(JSImageDataConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSImageDataConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSImageDataConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSImageDataPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSImageDataPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -109,8 +109,8 @@ JSObject* JSImageDataPrototype::self(ExecState* exec, JSGlobalObject* globalObje const ClassInfo JSImageData::s_info = { "ImageData", 0, &JSImageDataTable, 0 }; -JSImageData::JSImageData(PassRefPtr<Structure> structure, PassRefPtr<ImageData> impl) - : DOMObject(structure) +JSImageData::JSImageData(PassRefPtr<Structure> structure, JSDOMGlobalObject* globalObject, PassRefPtr<ImageData> impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -132,25 +132,28 @@ bool JSImageData::getOwnPropertySlot(ExecState* exec, const Identifier& property JSValue jsImageDataWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSImageData* castedThis = static_cast<JSImageData*>(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ImageData* imp = static_cast<ImageData*>(static_cast<JSImageData*>(asObject(slot.slotBase()))->impl()); + ImageData* imp = static_cast<ImageData*>(castedThis->impl()); return jsNumber(exec, imp->width()); } JSValue jsImageDataHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSImageData* castedThis = static_cast<JSImageData*>(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ImageData* imp = static_cast<ImageData*>(static_cast<JSImageData*>(asObject(slot.slotBase()))->impl()); + ImageData* imp = static_cast<ImageData*>(castedThis->impl()); return jsNumber(exec, imp->height()); } JSValue jsImageDataConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast<JSImageData*>(asObject(slot.slotBase()))->getConstructor(exec); + JSImageData* domObject = static_cast<JSImageData*>(asObject(slot.slotBase())); + return JSImageData::getConstructor(exec, domObject->globalObject()); } -JSValue JSImageData::getConstructor(ExecState* exec) +JSValue JSImageData::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor<JSImageDataConstructor>(exec); + return getDOMConstructor<JSImageDataConstructor>(exec, static_cast<JSDOMGlobalObject*>(globalObject)); } ImageData* toImageData(JSC::JSValue value) |