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/JSXMLHttpRequest.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/JSXMLHttpRequest.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.cpp b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.cpp index a326915..1b2c1f8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.cpp @@ -104,9 +104,9 @@ static const HashTable JSXMLHttpRequestPrototypeTable = const ClassInfo JSXMLHttpRequestPrototype::s_info = { "XMLHttpRequestPrototype", 0, &JSXMLHttpRequestPrototypeTable, 0 }; -JSObject* JSXMLHttpRequestPrototype::self(ExecState* exec) +JSObject* JSXMLHttpRequestPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSXMLHttpRequest>(exec); + return getDOMPrototype<JSXMLHttpRequest>(exec, globalObject); } bool JSXMLHttpRequestPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -128,9 +128,9 @@ JSXMLHttpRequest::~JSXMLHttpRequest() } -JSObject* JSXMLHttpRequest::createPrototype(ExecState* exec) +JSObject* JSXMLHttpRequest::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSXMLHttpRequestPrototype(JSXMLHttpRequestPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSXMLHttpRequestPrototype(JSXMLHttpRequestPrototype::createStructure(globalObject->objectPrototype())); } bool JSXMLHttpRequest::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) |