diff options
author | Alexis Menard <alexis.menard@nokia.com> | 2011-06-02 19:25:08 (GMT) |
---|---|---|
committer | Alexis Menard <alexis.menard@nokia.com> | 2011-06-02 19:25:08 (GMT) |
commit | 7d05276972ef33f87b7819989438e9dc2372f1bf (patch) | |
tree | 79d3040f0dcd0e4d49e310aa87655f0d12fdc011 /src/3rdparty/webkit | |
parent | 7a72bd5de1539b4346565175f591e3d9e3050044 (diff) | |
download | Qt-7d05276972ef33f87b7819989438e9dc2372f1bf.zip Qt-7d05276972ef33f87b7819989438e9dc2372f1bf.tar.gz Qt-7d05276972ef33f87b7819989438e9dc2372f1bf.tar.bz2 |
Updated WebKit to 7e7119292e94f55a66d391cd183a4dd6ec1a8d65
Reviewed by: Andreas Kling
Diffstat (limited to 'src/3rdparty/webkit')
8 files changed, 5 insertions, 119 deletions
diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.cpp b/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.cpp index 515e9a1..6fa2ad3 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.cpp +++ b/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.cpp @@ -410,7 +410,7 @@ ASSERT_CLASS_FITS_IN_CELL(JSDOMWindow); #define THUNK_GENERATOR(generator) #endif -static const HashTableValue JSDOMWindowTableValues[458] = +static const HashTableValue JSDOMWindowTableValues[456] = { { "screen", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowScreen), (intptr_t)setJSDOMWindowScreen THUNK_GENERATOR(0) }, { "history", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowHistory), (intptr_t)setJSDOMWindowHistory THUNK_GENERATOR(0) }, @@ -458,7 +458,6 @@ static const HashTableValue JSDOMWindowTableValues[458] = { "sessionStorage", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowSessionStorage), (intptr_t)0 THUNK_GENERATOR(0) }, { "localStorage", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowLocalStorage), (intptr_t)0 THUNK_GENERATOR(0) }, { "webkitNotifications", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowWebkitNotifications), (intptr_t)0 THUNK_GENERATOR(0) }, - { "orientation", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowOrientation), (intptr_t)0 THUNK_GENERATOR(0) }, { "console", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowConsole), (intptr_t)setJSDOMWindowConsole THUNK_GENERATOR(0) }, { "onabort", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowOnabort), (intptr_t)setJSDOMWindowOnabort THUNK_GENERATOR(0) }, { "onbeforeunload", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowOnbeforeunload), (intptr_t)setJSDOMWindowOnbeforeunload THUNK_GENERATOR(0) }, @@ -527,7 +526,6 @@ static const HashTableValue JSDOMWindowTableValues[458] = { "onwebkitanimationiteration", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowOnwebkitanimationiteration), (intptr_t)setJSDOMWindowOnwebkitanimationiteration THUNK_GENERATOR(0) }, { "onwebkitanimationstart", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowOnwebkitanimationstart), (intptr_t)setJSDOMWindowOnwebkitanimationstart THUNK_GENERATOR(0) }, { "onwebkittransitionend", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowOnwebkittransitionend), (intptr_t)setJSDOMWindowOnwebkittransitionend THUNK_GENERATOR(0) }, - { "onorientationchange", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowOnorientationchange), (intptr_t)setJSDOMWindowOnorientationchange THUNK_GENERATOR(0) }, #if ENABLE(TOUCH_EVENTS) { "ontouchstart", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsDOMWindowOntouchstart), (intptr_t)setJSDOMWindowOntouchstart THUNK_GENERATOR(0) }, #endif @@ -1585,18 +1583,6 @@ JSValue jsDOMWindowWebkitNotifications(ExecState* exec, JSValue slotBase, const } -JSValue jsDOMWindowOrientation(ExecState* exec, JSValue slotBase, const Identifier&) -{ - JSDOMWindow* castedThis = static_cast<JSDOMWindow*>(asObject(slotBase)); - if (!castedThis->allowsAccessFrom(exec)) - return jsUndefined(); - UNUSED_PARAM(exec); - DOMWindow* imp = static_cast<DOMWindow*>(castedThis->impl()); - JSValue result = jsNumber(imp->orientation()); - return result; -} - - JSValue jsDOMWindowConsole(ExecState* exec, JSValue slotBase, const Identifier&) { JSDOMWindow* castedThis = static_cast<JSDOMWindow*>(asObject(slotBase)); @@ -2748,23 +2734,6 @@ JSValue jsDOMWindowOnwebkittransitionend(ExecState* exec, JSValue slotBase, cons } -JSValue jsDOMWindowOnorientationchange(ExecState* exec, JSValue slotBase, const Identifier&) -{ - JSDOMWindow* castedThis = static_cast<JSDOMWindow*>(asObject(slotBase)); - if (!castedThis->allowsAccessFrom(exec)) - return jsUndefined(); - UNUSED_PARAM(exec); - DOMWindow* imp = static_cast<DOMWindow*>(castedThis->impl()); - if (EventListener* listener = imp->onorientationchange()) { - if (const JSEventListener* jsListener = JSEventListener::cast(listener)) { - if (JSObject* jsFunction = jsListener->jsFunction(imp->scriptExecutionContext())) - return jsFunction; - } - } - return jsNull(); -} - - #if ENABLE(TOUCH_EVENTS) JSValue jsDOMWindowOntouchstart(ExecState* exec, JSValue slotBase, const Identifier&) { @@ -7001,17 +6970,6 @@ void setJSDOMWindowOnwebkittransitionend(ExecState* exec, JSObject* thisObject, } -void setJSDOMWindowOnorientationchange(ExecState* exec, JSObject* thisObject, JSValue value) -{ - if (!static_cast<JSDOMWindow*>(thisObject)->allowsAccessFrom(exec)) - return; - UNUSED_PARAM(exec); - JSDOMWindow* castedThis = static_cast<JSDOMWindow*>(thisObject); - DOMWindow* imp = static_cast<DOMWindow*>(castedThis->impl()); - imp->setOnorientationchange(createJSAttributeEventListener(exec, value, thisObject)); -} - - #if ENABLE(TOUCH_EVENTS) void setJSDOMWindowOntouchstart(ExecState* exec, JSObject* thisObject, JSValue value) { diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.h b/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.h index 39b91eb..c0125f7 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.h +++ b/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.h @@ -240,7 +240,6 @@ JSC::JSValue jsDOMWindowApplicationCache(JSC::ExecState*, JSC::JSValue, const JS JSC::JSValue jsDOMWindowSessionStorage(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); JSC::JSValue jsDOMWindowLocalStorage(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); JSC::JSValue jsDOMWindowWebkitNotifications(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); -JSC::JSValue jsDOMWindowOrientation(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); JSC::JSValue jsDOMWindowConsole(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); void setJSDOMWindowConsole(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsDOMWindowOnabort(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); @@ -377,8 +376,6 @@ JSC::JSValue jsDOMWindowOnwebkitanimationstart(JSC::ExecState*, JSC::JSValue, co void setJSDOMWindowOnwebkitanimationstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsDOMWindowOnwebkittransitionend(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); void setJSDOMWindowOnwebkittransitionend(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); -JSC::JSValue jsDOMWindowOnorientationchange(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); -void setJSDOMWindowOnorientationchange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsDOMWindowOntouchstart(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); void setJSDOMWindowOntouchstart(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsDOMWindowOntouchmove(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLBodyElement.cpp b/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLBodyElement.cpp index 8342694..9f044ce 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLBodyElement.cpp +++ b/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLBodyElement.cpp @@ -42,7 +42,7 @@ ASSERT_CLASS_FITS_IN_CELL(JSHTMLBodyElement); #define THUNK_GENERATOR(generator) #endif -static const HashTableValue JSHTMLBodyElementTableValues[22] = +static const HashTableValue JSHTMLBodyElementTableValues[21] = { { "aLink", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementALink), (intptr_t)setJSHTMLBodyElementALink THUNK_GENERATOR(0) }, { "background", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementBackground), (intptr_t)setJSHTMLBodyElementBackground THUNK_GENERATOR(0) }, @@ -59,7 +59,6 @@ static const HashTableValue JSHTMLBodyElementTableValues[22] = { "onresize", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementOnresize), (intptr_t)setJSHTMLBodyElementOnresize THUNK_GENERATOR(0) }, { "onstorage", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementOnstorage), (intptr_t)setJSHTMLBodyElementOnstorage THUNK_GENERATOR(0) }, { "onunload", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementOnunload), (intptr_t)setJSHTMLBodyElementOnunload THUNK_GENERATOR(0) }, - { "onorientationchange", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementOnorientationchange), (intptr_t)setJSHTMLBodyElementOnorientationchange THUNK_GENERATOR(0) }, { "onblur", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementOnblur), (intptr_t)setJSHTMLBodyElementOnblur THUNK_GENERATOR(0) }, { "onerror", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementOnerror), (intptr_t)setJSHTMLBodyElementOnerror THUNK_GENERATOR(0) }, { "onfocus", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLBodyElementOnfocus), (intptr_t)setJSHTMLBodyElementOnfocus THUNK_GENERATOR(0) }, @@ -357,21 +356,6 @@ JSValue jsHTMLBodyElementOnunload(ExecState* exec, JSValue slotBase, const Ident } -JSValue jsHTMLBodyElementOnorientationchange(ExecState* exec, JSValue slotBase, const Identifier&) -{ - JSHTMLBodyElement* castedThis = static_cast<JSHTMLBodyElement*>(asObject(slotBase)); - UNUSED_PARAM(exec); - HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(castedThis->impl()); - if (EventListener* listener = imp->onorientationchange()) { - if (const JSEventListener* jsListener = JSEventListener::cast(listener)) { - if (JSObject* jsFunction = jsListener->jsFunction(imp->scriptExecutionContext())) - return jsFunction; - } - } - return jsNull(); -} - - JSValue jsHTMLBodyElementOnblur(ExecState* exec, JSValue slotBase, const Identifier&) { JSHTMLBodyElement* castedThis = static_cast<JSHTMLBodyElement*>(asObject(slotBase)); @@ -581,16 +565,6 @@ void setJSHTMLBodyElementOnunload(ExecState* exec, JSObject* thisObject, JSValue } -void setJSHTMLBodyElementOnorientationchange(ExecState* exec, JSObject* thisObject, JSValue value) -{ - UNUSED_PARAM(exec); - JSHTMLBodyElement* castedThis = static_cast<JSHTMLBodyElement*>(thisObject); - JSDOMGlobalObject* globalObject = castedThis->globalObject(); - HTMLBodyElement* imp = static_cast<HTMLBodyElement*>(castedThis->impl()); - imp->setOnorientationchange(createJSAttributeEventListener(exec, value, globalObject)); -} - - void setJSHTMLBodyElementOnblur(ExecState* exec, JSObject* thisObject, JSValue value) { UNUSED_PARAM(exec); diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLBodyElement.h b/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLBodyElement.h index d765070..de4b6f8 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLBodyElement.h +++ b/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLBodyElement.h @@ -95,8 +95,6 @@ JSC::JSValue jsHTMLBodyElementOnstorage(JSC::ExecState*, JSC::JSValue, const JSC void setJSHTMLBodyElementOnstorage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLBodyElementOnunload(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); void setJSHTMLBodyElementOnunload(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); -JSC::JSValue jsHTMLBodyElementOnorientationchange(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); -void setJSHTMLBodyElementOnorientationchange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLBodyElementOnblur(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); void setJSHTMLBodyElementOnblur(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLBodyElementOnerror(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLFrameSetElement.cpp b/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLFrameSetElement.cpp index 3508b9a..c65718b 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLFrameSetElement.cpp +++ b/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLFrameSetElement.cpp @@ -43,7 +43,7 @@ ASSERT_CLASS_FITS_IN_CELL(JSHTMLFrameSetElement); #define THUNK_GENERATOR(generator) #endif -static const HashTableValue JSHTMLFrameSetElementTableValues[18] = +static const HashTableValue JSHTMLFrameSetElementTableValues[17] = { { "cols", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementCols), (intptr_t)setJSHTMLFrameSetElementCols THUNK_GENERATOR(0) }, { "rows", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementRows), (intptr_t)setJSHTMLFrameSetElementRows THUNK_GENERATOR(0) }, @@ -56,7 +56,6 @@ static const HashTableValue JSHTMLFrameSetElementTableValues[18] = { "onresize", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementOnresize), (intptr_t)setJSHTMLFrameSetElementOnresize THUNK_GENERATOR(0) }, { "onstorage", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementOnstorage), (intptr_t)setJSHTMLFrameSetElementOnstorage THUNK_GENERATOR(0) }, { "onunload", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementOnunload), (intptr_t)setJSHTMLFrameSetElementOnunload THUNK_GENERATOR(0) }, - { "onorientationchange", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementOnorientationchange), (intptr_t)setJSHTMLFrameSetElementOnorientationchange THUNK_GENERATOR(0) }, { "onblur", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementOnblur), (intptr_t)setJSHTMLFrameSetElementOnblur THUNK_GENERATOR(0) }, { "onerror", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementOnerror), (intptr_t)setJSHTMLFrameSetElementOnerror THUNK_GENERATOR(0) }, { "onfocus", DontDelete | DontEnum, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsHTMLFrameSetElementOnfocus), (intptr_t)setJSHTMLFrameSetElementOnfocus THUNK_GENERATOR(0) }, @@ -66,7 +65,7 @@ static const HashTableValue JSHTMLFrameSetElementTableValues[18] = }; #undef THUNK_GENERATOR -static JSC_CONST_HASHTABLE HashTable JSHTMLFrameSetElementTable = { 64, 63, JSHTMLFrameSetElementTableValues, 0 }; +static JSC_CONST_HASHTABLE HashTable JSHTMLFrameSetElementTable = { 33, 31, JSHTMLFrameSetElementTableValues, 0 }; /* Hash table for constructor */ #if ENABLE(JIT) #define THUNK_GENERATOR(generator) , generator @@ -324,21 +323,6 @@ JSValue jsHTMLFrameSetElementOnunload(ExecState* exec, JSValue slotBase, const I } -JSValue jsHTMLFrameSetElementOnorientationchange(ExecState* exec, JSValue slotBase, const Identifier&) -{ - JSHTMLFrameSetElement* castedThis = static_cast<JSHTMLFrameSetElement*>(asObject(slotBase)); - UNUSED_PARAM(exec); - HTMLFrameSetElement* imp = static_cast<HTMLFrameSetElement*>(castedThis->impl()); - if (EventListener* listener = imp->onorientationchange()) { - if (const JSEventListener* jsListener = JSEventListener::cast(listener)) { - if (JSObject* jsFunction = jsListener->jsFunction(imp->scriptExecutionContext())) - return jsFunction; - } - } - return jsNull(); -} - - JSValue jsHTMLFrameSetElementOnblur(ExecState* exec, JSValue slotBase, const Identifier&) { JSHTMLFrameSetElement* castedThis = static_cast<JSHTMLFrameSetElement*>(asObject(slotBase)); @@ -516,15 +500,6 @@ void setJSHTMLFrameSetElementOnunload(ExecState* exec, JSObject* thisObject, JSV } -void setJSHTMLFrameSetElementOnorientationchange(ExecState* exec, JSObject* thisObject, JSValue value) -{ - UNUSED_PARAM(exec); - JSHTMLFrameSetElement* castedThis = static_cast<JSHTMLFrameSetElement*>(thisObject); - HTMLFrameSetElement* imp = static_cast<HTMLFrameSetElement*>(castedThis->impl()); - imp->setOnorientationchange(createJSAttributeEventListener(exec, value, thisObject)); -} - - void setJSHTMLFrameSetElementOnblur(ExecState* exec, JSObject* thisObject, JSValue value) { UNUSED_PARAM(exec); diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLFrameSetElement.h b/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLFrameSetElement.h index c01f5e3..c0a30ca 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLFrameSetElement.h +++ b/src/3rdparty/webkit/Source/WebCore/generated/JSHTMLFrameSetElement.h @@ -90,8 +90,6 @@ JSC::JSValue jsHTMLFrameSetElementOnstorage(JSC::ExecState*, JSC::JSValue, const void setJSHTMLFrameSetElementOnstorage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLFrameSetElementOnunload(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); void setJSHTMLFrameSetElementOnunload(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); -JSC::JSValue jsHTMLFrameSetElementOnorientationchange(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); -void setJSHTMLFrameSetElementOnorientationchange(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLFrameSetElementOnblur(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); void setJSHTMLFrameSetElementOnblur(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLFrameSetElementOnerror(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSNavigator.cpp b/src/3rdparty/webkit/Source/WebCore/generated/JSNavigator.cpp index 1c25b67..ce3ac5a 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/JSNavigator.cpp +++ b/src/3rdparty/webkit/Source/WebCore/generated/JSNavigator.cpp @@ -24,11 +24,9 @@ #include "DOMMimeTypeArray.h" #include "DOMPluginArray.h" #include "ExceptionCode.h" -#include "Geolocation.h" #include "JSDOMBinding.h" #include "JSDOMMimeTypeArray.h" #include "JSDOMPluginArray.h" -#include "JSGeolocation.h" #include "KURL.h" #include "Navigator.h" #include <runtime/Error.h> @@ -48,7 +46,7 @@ ASSERT_CLASS_FITS_IN_CELL(JSNavigator); #define THUNK_GENERATOR(generator) #endif -static const HashTableValue JSNavigatorTableValues[16] = +static const HashTableValue JSNavigatorTableValues[15] = { { "appCodeName", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsNavigatorAppCodeName), (intptr_t)0 THUNK_GENERATOR(0) }, { "appName", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsNavigatorAppName), (intptr_t)0 THUNK_GENERATOR(0) }, @@ -64,7 +62,6 @@ static const HashTableValue JSNavigatorTableValues[16] = { "vendorSub", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsNavigatorVendorSub), (intptr_t)0 THUNK_GENERATOR(0) }, { "cookieEnabled", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsNavigatorCookieEnabled), (intptr_t)0 THUNK_GENERATOR(0) }, { "onLine", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsNavigatorOnLine), (intptr_t)0 THUNK_GENERATOR(0) }, - { "geolocation", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsNavigatorGeolocation), (intptr_t)0 THUNK_GENERATOR(0) }, { 0, 0, 0, 0 THUNK_GENERATOR(0) } }; @@ -267,16 +264,6 @@ JSValue jsNavigatorOnLine(ExecState* exec, JSValue slotBase, const Identifier&) } -JSValue jsNavigatorGeolocation(ExecState* exec, JSValue slotBase, const Identifier&) -{ - JSNavigator* castedThis = static_cast<JSNavigator*>(asObject(slotBase)); - UNUSED_PARAM(exec); - Navigator* imp = static_cast<Navigator*>(castedThis->impl()); - JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->geolocation())); - return result; -} - - EncodedJSValue JSC_HOST_CALL jsNavigatorPrototypeFunctionJavaEnabled(ExecState* exec) { JSValue thisValue = exec->hostThisValue(); diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSNavigator.h b/src/3rdparty/webkit/Source/WebCore/generated/JSNavigator.h index d632434..243c490 100644 --- a/src/3rdparty/webkit/Source/WebCore/generated/JSNavigator.h +++ b/src/3rdparty/webkit/Source/WebCore/generated/JSNavigator.h @@ -107,7 +107,6 @@ JSC::JSValue jsNavigatorVendor(JSC::ExecState*, JSC::JSValue, const JSC::Identif JSC::JSValue jsNavigatorVendorSub(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); JSC::JSValue jsNavigatorCookieEnabled(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); JSC::JSValue jsNavigatorOnLine(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); -JSC::JSValue jsNavigatorGeolocation(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&); } // namespace WebCore |