diff options
Diffstat (limited to 'src/3rdparty/webkit/WebCore/generated/JSGeolocation.cpp')
-rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSGeolocation.cpp | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSGeolocation.cpp b/src/3rdparty/webkit/WebCore/generated/JSGeolocation.cpp index 1d02e9004f..928e5768a5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSGeolocation.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSGeolocation.cpp @@ -34,7 +34,7 @@ using namespace JSC; namespace WebCore { -ASSERT_CLASS_FITS_IN_CELL(JSGeolocation) +ASSERT_CLASS_FITS_IN_CELL(JSGeolocation); /* Hash table */ @@ -70,9 +70,9 @@ static const HashTable JSGeolocationPrototypeTable = const ClassInfo JSGeolocationPrototype::s_info = { "GeolocationPrototype", 0, &JSGeolocationPrototypeTable, 0 }; -JSObject* JSGeolocationPrototype::self(ExecState* exec) +JSObject* JSGeolocationPrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSGeolocation>(exec); + return getDOMPrototype<JSGeolocation>(exec, globalObject); } bool JSGeolocationPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -91,12 +91,11 @@ JSGeolocation::JSGeolocation(PassRefPtr<Structure> structure, PassRefPtr<Geoloca JSGeolocation::~JSGeolocation() { forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); - } -JSObject* JSGeolocation::createPrototype(ExecState* exec) +JSObject* JSGeolocation::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSGeolocationPrototype(JSGeolocationPrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSGeolocationPrototype(JSGeolocationPrototype::createStructure(globalObject->objectPrototype())); } bool JSGeolocation::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -104,47 +103,51 @@ bool JSGeolocation::getOwnPropertySlot(ExecState* exec, const Identifier& proper return getStaticValueSlot<JSGeolocation, Base>(exec, &JSGeolocationTable, this, propertyName, slot); } -JSValuePtr jsGeolocationLastPosition(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsGeolocationLastPosition(ExecState* exec, const Identifier&, const PropertySlot& slot) { + UNUSED_PARAM(exec); Geolocation* imp = static_cast<Geolocation*>(static_cast<JSGeolocation*>(asObject(slot.slotBase()))->impl()); return toJS(exec, WTF::getPtr(imp->lastPosition())); } -JSValuePtr jsGeolocationPrototypeFunctionGetCurrentPosition(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsGeolocationPrototypeFunctionGetCurrentPosition(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSGeolocation::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSGeolocation::s_info)) return throwError(exec, TypeError); JSGeolocation* castedThisObj = static_cast<JSGeolocation*>(asObject(thisValue)); return castedThisObj->getCurrentPosition(exec, args); } -JSValuePtr jsGeolocationPrototypeFunctionWatchPosition(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsGeolocationPrototypeFunctionWatchPosition(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSGeolocation::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSGeolocation::s_info)) return throwError(exec, TypeError); JSGeolocation* castedThisObj = static_cast<JSGeolocation*>(asObject(thisValue)); return castedThisObj->watchPosition(exec, args); } -JSValuePtr jsGeolocationPrototypeFunctionClearWatch(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList& args) +JSValue JSC_HOST_CALL jsGeolocationPrototypeFunctionClearWatch(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { - if (!thisValue->isObject(&JSGeolocation::s_info)) + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSGeolocation::s_info)) return throwError(exec, TypeError); JSGeolocation* castedThisObj = static_cast<JSGeolocation*>(asObject(thisValue)); Geolocation* imp = static_cast<Geolocation*>(castedThisObj->impl()); - int watchId = args.at(exec, 0)->toInt32(exec); + int watchId = args.at(0).toInt32(exec); imp->clearWatch(watchId); return jsUndefined(); } -JSC::JSValuePtr toJS(JSC::ExecState* exec, Geolocation* object) +JSC::JSValue toJS(JSC::ExecState* exec, Geolocation* object) { return getDOMObjectWrapper<JSGeolocation>(exec, object); } -Geolocation* toGeolocation(JSC::JSValuePtr value) +Geolocation* toGeolocation(JSC::JSValue value) { - return value->isObject(&JSGeolocation::s_info) ? static_cast<JSGeolocation*>(asObject(value))->impl() : 0; + return value.isObject(&JSGeolocation::s_info) ? static_cast<JSGeolocation*>(asObject(value))->impl() : 0; } } |