Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

1 files changed, 14 insertions, 9 deletions

diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.cpp b/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.cpp
index 76da8f1bc..bc082b856 100644
--- a/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.cpp
+++ b/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.cpp
@@ -85,8 +85,8 @@ static const HashTable* getJSWorkerNavigatorTable(ExecState* exec)
 }
 const ClassInfo JSWorkerNavigator::s_info = { "WorkerNavigator", 0, 0, getJSWorkerNavigatorTable };
 
-JSWorkerNavigator::JSWorkerNavigator(PassRefPtr<Structure> structure, PassRefPtr<WorkerNavigator> impl)
-    : DOMObject(structure)
+JSWorkerNavigator::JSWorkerNavigator(PassRefPtr<Structure> structure, JSDOMGlobalObject* globalObject, PassRefPtr<WorkerNavigator> impl)
+    : DOMObjectWithGlobalPointer(structure, globalObject)
     , m_impl(impl)
 {
 }
@@ -108,42 +108,47 @@ bool JSWorkerNavigator::getOwnPropertySlot(ExecState* exec, const Identifier& pr
 
 JSValue jsWorkerNavigatorAppName(ExecState* exec, const Identifier&, const PropertySlot& slot)
 {
+    JSWorkerNavigator* castedThis = static_cast<JSWorkerNavigator*>(asObject(slot.slotBase()));
     UNUSED_PARAM(exec);
-    WorkerNavigator* imp = static_cast<WorkerNavigator*>(static_cast<JSWorkerNavigator*>(asObject(slot.slotBase()))->impl());
+    WorkerNavigator* imp = static_cast<WorkerNavigator*>(castedThis->impl());
     return jsString(exec, imp->appName());
 }
 
 JSValue jsWorkerNavigatorAppVersion(ExecState* exec, const Identifier&, const PropertySlot& slot)
 {
+    JSWorkerNavigator* castedThis = static_cast<JSWorkerNavigator*>(asObject(slot.slotBase()));
     UNUSED_PARAM(exec);
-    WorkerNavigator* imp = static_cast<WorkerNavigator*>(static_cast<JSWorkerNavigator*>(asObject(slot.slotBase()))->impl());
+    WorkerNavigator* imp = static_cast<WorkerNavigator*>(castedThis->impl());
     return jsString(exec, imp->appVersion());
 }
 
 JSValue jsWorkerNavigatorPlatform(ExecState* exec, const Identifier&, const PropertySlot& slot)
 {
+    JSWorkerNavigator* castedThis = static_cast<JSWorkerNavigator*>(asObject(slot.slotBase()));
     UNUSED_PARAM(exec);
-    WorkerNavigator* imp = static_cast<WorkerNavigator*>(static_cast<JSWorkerNavigator*>(asObject(slot.slotBase()))->impl());
+    WorkerNavigator* imp = static_cast<WorkerNavigator*>(castedThis->impl());
     return jsString(exec, imp->platform());
 }
 
 JSValue jsWorkerNavigatorUserAgent(ExecState* exec, const Identifier&, const PropertySlot& slot)
 {
+    JSWorkerNavigator* castedThis = static_cast<JSWorkerNavigator*>(asObject(slot.slotBase()));
     UNUSED_PARAM(exec);
-    WorkerNavigator* imp = static_cast<WorkerNavigator*>(static_cast<JSWorkerNavigator*>(asObject(slot.slotBase()))->impl());
+    WorkerNavigator* imp = static_cast<WorkerNavigator*>(castedThis->impl());
     return jsString(exec, imp->userAgent());
 }
 
 JSValue jsWorkerNavigatorOnLine(ExecState* exec, const Identifier&, const PropertySlot& slot)
 {
+    JSWorkerNavigator* castedThis = static_cast<JSWorkerNavigator*>(asObject(slot.slotBase()));
     UNUSED_PARAM(exec);
-    WorkerNavigator* imp = static_cast<WorkerNavigator*>(static_cast<JSWorkerNavigator*>(asObject(slot.slotBase()))->impl());
+    WorkerNavigator* imp = static_cast<WorkerNavigator*>(castedThis->impl());
     return jsBoolean(imp->onLine());
 }
 
-JSC::JSValue toJS(JSC::ExecState* exec, WorkerNavigator* object)
+JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, WorkerNavigator* object)
 {
-    return getDOMObjectWrapper<JSWorkerNavigator>(exec, object);
+    return getDOMObjectWrapper<JSWorkerNavigator>(exec, globalObject, object);
 }
 WorkerNavigator* toWorkerNavigator(JSC::JSValue value)
 {